bug fixes

src/modules/course/learn/views/Index.vue

@@ -23,8 +23,9 @@ export default {
         this.$message.error('暂无权限')
         return
       }
-      if (new Date(this.$store.state.user.student_info.expiration_time).getTime() < new Date().getTime()) {
+      if (new Date(this.$store.state.user.student_info.expiration_time).getTime() <= new Date().getTime()) {
         this.$message.warning('您的课程已到期，请完成续费后再学习和考试')
+        return false
       } else {
         this.$router.push({ name: 'courseLearnItem', query: { id: data.course_id } })
       }

src/modules/exam/exam/views/Index.vue

@@ -132,19 +132,20 @@ export default {
     },
     // 重新考试
     reStartExam(data) {
-      if (new Date(this.$store.state.user.student_info.expiration_time).getTime() < new Date().getTime()) {
+      if (new Date(this.$store.state.user.student_info.expiration_time).getTime() <= new Date().getTime()) {
         this.$message.warning('您的课程已到期，请完成续费后再学习和考试')
-        return
-      }
+        return false
+      } else {
         this.dialogVisible = true
         this.curExamId = data.id
         this.curExamTitle = data.paper_title
+      }
     },
     startExam(data) {
-      if (new Date(this.$store.state.user.student_info.expiration_time).getTime() < new Date().getTime()) {
+      if (new Date(this.$store.state.user.student_info.expiration_time).getTime() <= new Date().getTime()) {
         this.$message.warning('您的课程已到期，请完成续费后再学习和考试')
-        return
-      }
+        return false
+      } else {
         const num = parseInt(data.status)
         const leaveTimes = data.leave_times || 0
         if (leaveTimes >= 4) {
@@ -165,6 +166,7 @@ export default {
           })
           return false
         }
+
         switch (num) {
           case 100:
             this.$message({
@@ -236,6 +238,7 @@ export default {
             break
         }
       }
+    }
   },
   watch: {
     dialogVisible: function (newVal, oldVal) {

src/modules/exam/exam/views/Result.vue

@@ -7,23 +7,8 @@
           {{ data.sheet.created_time }}
         </span>
       </div>
-      <div v-if="expirationMonth === 3" style="position: relative">
-        <el-empty description="您已考试通过，请扫描下方二维码获取证书"></el-empty>
-        <img
-          src="https://webapp-pub.ezijing.com/project/fd/u171.png"
-          alt=""
-          style="
-            position: absolute;
-            top: 350px;
-            left: 50%;
-            transform: translate(-50%, -50%);
-            width: 200px;
-            height: 200px;
-          "
-        />
-      </div>
       <div class="chart-box">
-        <div class="chart-item" v-if="expirationMonth === 12 && Object.keys(datas.data).length">
+        <div class="chart-item" v-if="Object.keys(datas.data).length">
           <div class="chart-title">成绩</div>
           <chart :accuracy="score" :accuracScore="totalScore">
             <template v-slot:tips>
@@ -32,7 +17,7 @@
           </chart>
         </div>
       </div>
-      <p class="new__text" v-if="expirationMonth === 12">{{ resultText }}</p>
+      <p class="new__text" >{{ resultText }}</p>
     </div>
   </div>
 </template>
@@ -64,7 +49,7 @@ export default {
   computed: {
     resultText() {
       return this.score >= 80
-        ? '恭喜考试通过，您已获得金融数据合规管理证书，请前往我的证书页面查看'
+        ? '恭喜您考试通过，申领证书请前往我的证书页面'
         : this.datas.times > 1 ? '系统将向管理员发送重考申请，您可同步开始课程重修，重修完成且审批通过后方可继续考试' : '考试未通过，请重新完成视频课程学习后再次参加考试'
     },
     examId() {