From 81a2f6b06cab5c34bef44e149a885cde9e74aa00 Mon Sep 17 00:00:00 2001
From: daihh <seastar@bjxask.com>
Date: Mon, 24 Oct 2022 18:01:08 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=81=9C=E7=94=A8=E6=88=96?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E9=99=90=E5=88=B6=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/portal/course/Detail.vue |  6 ++++++
 src/views/study/coursenew.vue      | 22 ++++++++++++++++------
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/src/views/portal/course/Detail.vue b/src/views/portal/course/Detail.vue
index 4e4c2c41..b06c7c3e 100644
--- a/src/views/portal/course/Detail.vue
+++ b/src/views/portal/course/Detail.vue
@@ -184,6 +184,12 @@ export default {
     //页面只支取一次，所以先直接写在这里面
     apiCoursePortal.detail(id,false).then(rs=>{
       if(rs.status==200){
+
+        if(!rs.result.course.enabled || rs.result.course.deleted){
+          $this.$message.error('十分抱歉，此课程已停用，如需使用，请联系管理员。');
+          return;
+        }
+
         if(rs.result.teachers && rs.result.teachers.length > 0){
           let userIds=[];
           let ctoUsers=[];
diff --git a/src/views/study/coursenew.vue b/src/views/study/coursenew.vue
index 81ae32ba..53b5a14d 100644
--- a/src/views/study/coursenew.vue
+++ b/src/views/study/coursenew.vue
@@ -1027,6 +1027,10 @@
               $this.$message.error('课程内容已删除或课程已不再使用');
               return;
             }
+            // if(!rs.result.course.enabled){
+            //   $this.$message.error('十分抱歉，此课程已停用，如需使用，请联系管理员。');
+            //   return;
+            // }
             //设置必须的字段
             if(rs.result.contents.length==1){
                $this.tab=2;
@@ -1144,12 +1148,18 @@
               }
 
             } else {
-              this.$message.error('您还未报名');
-              // if (this.courseInfo.type == 10) {
-              //   location.href = this.webBaseUrl + '/course/micro?id=' + this.courseId;
-              // } else {
-              location.href = this.webBaseUrl + '/course/detail?id=' + this.courseId;
-              // }
+              if(!$this.courseInfo.enabled  || $this.courseInfo.deleted){
+                $this.$message.error('十分抱歉，此课程已停用，如需使用，请联系管理员。');
+                location.href = this.webBaseUrl + '/course/detail?id=' + this.courseId;
+              }else{
+                this.$message.error('您还未报名');
+                // if (this.courseInfo.type == 10) {
+                //   location.href = this.webBaseUrl + '/course/micro?id=' + this.courseId;
+                // } else {
+                location.href = this.webBaseUrl + '/course/detail?id=' + this.courseId;
+                // }
+              }
+
             }
           } else {
             this.$message.error(res.message);