From 540b1d8d7a5763ba99c7fabaf5925de1bc4a1522 Mon Sep 17 00:00:00 2001
From: zhaofang <752743406@qq.com>
Date: Fri, 28 Oct 2022 10:44:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Course/collectItem.vue       |  8 ++++----
 src/components/Course/shareItem.vue         |  8 ++++----
 src/components/Course/studyItem.vue         | 12 ++++++------
 src/components/Portal/course/courseItem.vue |  8 ++++----
 src/components/Study/manager.vue            |  8 ++++----
 src/components/UserCenter/menu.vue          |  8 ++++----
 src/views/StudyIndex.vue                    |  8 ++++----
 src/views/course/ManageList.vue             |  2 +-
 src/views/course/TeacherList.vue            | 20 ++++++++++----------
 src/views/course/WaitAudit.vue              | 11 +++++------
 src/views/examine/NotApproved.vue           | 11 +++++------
 src/views/homepage/leavingMessage.vue       |  6 ++++++
 src/views/portal/course/Index.vue           | 20 ++++++++++----------
 src/views/portal/user/Message.vue           |  8 ++++----
 src/views/study/Courses.vue                 | 10 +++++-----
 src/views/study/FinishCourses.vue           | 12 ++++++------
 src/views/study/PortalIndex.vue             |  8 ++++----
 17 files changed, 86 insertions(+), 82 deletions(-)

diff --git a/src/components/Course/collectItem.vue b/src/components/Course/collectItem.vue
index d2762ed5..6ee1e609 100644
--- a/src/components/Course/collectItem.vue
+++ b/src/components/Course/collectItem.vue
@@ -67,11 +67,11 @@ export default {
     coudetail(item) {
       // let routeData = this.$router.resolve({ path: '/course/detail?id=' + item.objId });
       // window.open(routeData.href, '_blank');
-      if(item.contentType == '20') {
+      // if(item.contentType == '20') {
         this.$router.push({path:'/course/detail',query:{id:item.objId || item.id}})
-      } else {
-        this.$router.push({path:'/course/micro',query:{id:item.objId || item.id}})
-      }
+      // } else {
+      //   this.$router.push({path:'/course/micro',query:{id:item.objId || item.id}})
+      // }
       
     },
     delItem(item) {
diff --git a/src/components/Course/shareItem.vue b/src/components/Course/shareItem.vue
index f89b032b..c71d7e3b 100644
--- a/src/components/Course/shareItem.vue
+++ b/src/components/Course/shareItem.vue
@@ -141,11 +141,11 @@ export default {
       }
       }
       
-      if(item.contentType == 20) {
+      // if(item.contentType == 20) {
         this.$router.push({path:'/course/detail',query:{id:item.objId || item.id}})
-      } else {
-        this.$router.push({path:'/course/micro',query:{id:item.objId || item.id}})
-      }
+      // } else {
+      //   this.$router.push({path:'/course/micro',query:{id:item.objId || item.id}})
+      // }
 
      // window.open(`${this.webBaseUrl}/course/detail?id=${item.objId}`)
     },
diff --git a/src/components/Course/studyItem.vue b/src/components/Course/studyItem.vue
index f1b0f402..32fe409b 100644
--- a/src/components/Course/studyItem.vue
+++ b/src/components/Course/studyItem.vue
@@ -52,11 +52,11 @@ import courseImage from "@/components/Course/courseImage.vue"
         this.$router.push({path:'/uc/study/index?id='+item.courseId});
       },
       jumpRouter(item){
-        if(item.courseType==10){
-            let routeData = this.$router.resolve({ path: '/course/micro?id='+item.courseId}); // , query: {  id: 1 }
-            window.open(this.webBaseUrl+routeData.href, '_blank');
-        }
-        if(item.courseType==20){
+        // if(item.courseType==10){
+        //     let routeData = this.$router.resolve({ path: '/course/micro?id='+item.courseId}); // , query: {  id: 1 }
+        //     window.open(this.webBaseUrl+routeData.href, '_blank');
+        // }
+        // if(item.courseType==20){
           if(item.progress>0 && item.progress<100) {
             let routeData = this.$router.resolve({ path: '/course/studyindex?id='+item.courseId}); // , query: {  id: 1 }
             window.open(this.webBaseUrl+routeData.href, '_blank');
@@ -64,7 +64,7 @@ import courseImage from "@/components/Course/courseImage.vue"
             let routeData = this.$router.resolve({ path: '/course/detail?id='+item.courseId}); // , query: {  id: 1 }
             window.open(this.webBaseUrl+routeData.href, '_blank');
           }
-        }
+        // }
       }
     }
   }
diff --git a/src/components/Portal/course/courseItem.vue b/src/components/Portal/course/courseItem.vue
index 9a0ab8ef..2a4573e1 100644
--- a/src/components/Portal/course/courseItem.vue
+++ b/src/components/Portal/course/courseItem.vue
@@ -68,11 +68,11 @@
     },
     methods:{
       jumpRouter(c){
-        if(c.type==20){
+        // if(c.type==20){
           return '/course/detail?id='+c.id
-        }else if(c.type==10){
-          return '/course/micro?id='+c.id
-        }
+        // }else if(c.type==10){
+        //   return '/course/micro?id='+c.id
+        // }
       },
       jumpPicture(c){
         if(c.type==20){
diff --git a/src/components/Study/manager.vue b/src/components/Study/manager.vue
index 3c3adf88..0239e7a9 100644
--- a/src/components/Study/manager.vue
+++ b/src/components/Study/manager.vue
@@ -600,11 +600,11 @@ export default {
               }
             }else{
               this.$message.error('您还未报名');
-              if(this.courseInfo.type==10){
-                location.href = this.webBaseUrl + "/course/micro?id="+this.courseId;
-              }else{
+              // 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);
diff --git a/src/components/UserCenter/menu.vue b/src/components/UserCenter/menu.vue
index 80f8b97d..466e368e 100644
--- a/src/components/UserCenter/menu.vue
+++ b/src/components/UserCenter/menu.vue
@@ -397,11 +397,11 @@ export default {
       if(isNaN(item.courseType)){
         return `${this.webBaseUrl}/course/boeframe?id=${item.courseId}&type=${item.courseId}`;
       } else {
-       if(item.courseType==10){
-        return this.webBaseUrl+'/course/micro?id='+item.courseId;
-        }else if(item.courseType==20){
+      //  if(item.courseType==10){
+      //   return this.webBaseUrl+'/course/micro?id='+item.courseId;
+      //   }else if(item.courseType==20){
         return this.webBaseUrl+'/course/detail?id='+item.courseId;
-       }
+      //  }
       }
 
       return '';
diff --git a/src/views/StudyIndex.vue b/src/views/StudyIndex.vue
index 1adfa426..7ad520f0 100644
--- a/src/views/StudyIndex.vue
+++ b/src/views/StudyIndex.vue
@@ -169,11 +169,11 @@
     },
     methods:{
       continueStudy(item){
-        if(item.courseType==10){
-          return '../course/micro?id='+item.courseId
-        }else{
+        // if(item.courseType==10){
+        //   return '../course/micro?id='+item.courseId
+        // }else{
           return '../course/studyindex?id='+item.courseId
-        }
+        // }
       },
       ...mapActions({
         getResOwnerTree:'resOwner/getResOwnerTree',
diff --git a/src/views/course/ManageList.vue b/src/views/course/ManageList.vue
index 84f36b93..d642558b 100644
--- a/src/views/course/ManageList.vue
+++ b/src/views/course/ManageList.vue
@@ -622,7 +622,7 @@ export default {
     jumpDetails() {
       // this.$router.push('/course/micro');
       // 跳转打开新页面
-       let routeData = this.$router.resolve({ path: '/course/micro'}); // , query: {  id: 1 }
+       let routeData = this.$router.resolve({ path: '/course/detail'}); // , query: {  id: 1 }
        window.open(this.webBaseUrl+routeData.href, '_blank');
     },
     toExamine(row) {
diff --git a/src/views/course/TeacherList.vue b/src/views/course/TeacherList.vue
index 83290b1e..cb797efc 100644
--- a/src/views/course/TeacherList.vue
+++ b/src/views/course/TeacherList.vue
@@ -269,26 +269,26 @@ export default {
     },
     jumpRouter(item) {
       if (item.published) {
-        if (item.type == 10) {
+        // if (item.type == 10) {
           // let routeData = this.$router.resolve({ path: '/course/micro?id='+item.id});
           // window.open(this.webBaseUrl+routeData.href, '_blank');
         //  window.open(this.webBaseUrl + '/course/micro?id=' + item.id, '_blank');
-          this.$router.push({path:'/course/micro',query:{id:item.id}})
-        }
-        if (item.type == 20) {
+          // this.$router.push({path:'/course/micro',query:{id:item.id}})
+        // }
+        // if (item.type == 20) {
           // let routeData = this.$router.resolve({ path: '/course/detail?id='+item.id});
           // window.open(this.webBaseUrl+routeData.href, '_blank');
          // window.open(this.webBaseUrl + '/course/detail?id=' + item.id, '_blank');
          this.$router.push({path:'/course/detail',query:{id:item.id}})
-        }
+        // }
       } else {
-        if (item.type == 10) {
-        //  window.open(`${this.webBaseUrl}/course/microPreview?id=${item.id}`);
-         this.$router.push({path:'/course/microPreview',query:{id:item.id}})
-        } else {
+        // if (item.type == 10) {
+        // //  window.open(`${this.webBaseUrl}/course/microPreview?id=${item.id}`);
+        //  this.$router.push({path:'/course/microPreview',query:{id:item.id}})
+        // } else {
       //    window.open(`${this.webBaseUrl}/course/rePreview?id=${item.id}`);
        this.$router.push({path:'/course/rePreview',query:{id:item.id}})
-        }
+        // }
       }
     },
     findList() {
diff --git a/src/views/course/WaitAudit.vue b/src/views/course/WaitAudit.vue
index 0e05a890..7c28a764 100644
--- a/src/views/course/WaitAudit.vue
+++ b/src/views/course/WaitAudit.vue
@@ -311,12 +311,11 @@ export default {
     },
     //预览跳转页面
     toPreview(row) {
-     if(row.type == 10) {
-
-        window.open(`${this.webBaseUrl}/course/microPreview?id=${row.id}`);
-     } else{
+    //  if(row.type == 10) {
+    //     window.open(`${this.webBaseUrl}/course/microPreview?id=${row.id}`);
+    //  } else{
         window.open(`${this.webBaseUrl}/course/rePreview?id=${row.id}`);
-     }
+    //  }
 
     },
      // 直接审核
@@ -401,7 +400,7 @@ export default {
     },
     jumpDetails() {
       // 跳转打开新页面
-       let routeData = this.$router.resolve({ path: '/course/micro'});
+       let routeData = this.$router.resolve({ path: '/course/detail'});
        window.open(this.webBaseUrl+routeData.href, '_blank');
     },
     toExamine(row) {
diff --git a/src/views/examine/NotApproved.vue b/src/views/examine/NotApproved.vue
index 3874da1d..592e1dab 100644
--- a/src/views/examine/NotApproved.vue
+++ b/src/views/examine/NotApproved.vue
@@ -432,12 +432,11 @@ export default {
     },
     //预览跳转页面
     toPreview(row) {
-     if(row.type == 10) {
-
-        window.open(`${this.webBaseUrl}/course/microPreview?id=${row.id}`);
-     } else{
+    //  if(row.type == 10) {
+    //     window.open(`${this.webBaseUrl}/course/microPreview?id=${row.id}`);
+    //  } else{
         window.open(`${this.webBaseUrl}/course/rePreview?id=${row.id}`);
-     }
+    //  }
 
     },
      //直接审核
@@ -517,7 +516,7 @@ export default {
     },
     jumpDetails() {
       // 跳转打开新页面
-       let routeData = this.$router.resolve({ path: '/course/micro'});
+       let routeData = this.$router.resolve({ path: '/course/detail'});
        window.open(this.webBaseUrl+routeData.href, '_blank');
     },
     toExamine(row) {
diff --git a/src/views/homepage/leavingMessage.vue b/src/views/homepage/leavingMessage.vue
index d0bc0f79..21500740 100644
--- a/src/views/homepage/leavingMessage.vue
+++ b/src/views/homepage/leavingMessage.vue
@@ -141,6 +141,9 @@
           this.replysData.reply = item.replysList;
         },
         addReplys() {
+          if(this.replysContent.trim().length  == 0) {
+            return this.$message.warning('请填写内容！');
+          }
           this.replysData.reply.push({
             content: this.replysContent,
             authorInfo:this.userInfo,
@@ -176,6 +179,9 @@
           })
         },
         add() {
+          if(this.textarea.trim().length  == 0) {
+            return this.$message.warning('请填写内容！');
+          }
           let data = {
             content:this.textarea,//留言内容
             aid:this.pageId,//  要留言的人的id
diff --git a/src/views/portal/course/Index.vue b/src/views/portal/course/Index.vue
index 1eef6a63..ed368d6a 100644
--- a/src/views/portal/course/Index.vue
+++ b/src/views/portal/course/Index.vue
@@ -847,16 +847,16 @@ export default {
     jumpRouter(item) {
       //console.log(item.type, "item.type");
       // return console.log(id,type,"fihkj1")
-      if (item.type == 20) {
+      // if (item.type == 20) {
         //录播课
         //  window.open(`${this.webBaseUrl}/course/detail?id=${id}`)
         this.$router.push(`/course/detail?id=${item.id}`);
-      }
-      if (item.type == 10) {
+      // }
+      // if (item.type == 10) {
         //微课
         //  window.open(`${this.webBaseUrl}/course/micro?id=${id}`)
-        this.$router.push(`/course/micro?id=${item.id}`);
-      }
+      //   this.$router.push(`/course/micro?id=${item.id}`);
+      // }
     },
     jumpRouter2(item) {
       // console.log(item,"土豪包括九年")
@@ -865,16 +865,16 @@ export default {
 
       //console.log(item.type,type,'item.type');
       // return console.log(id,type,"fihkj1")
-      if (type == 20) {
+      // if (type == 20) {
         //录播课
         //  window.open(`${this.webBaseUrl}/course/detail?id=${id}`)
         this.$router.push(`/course/detail?id=${id}`);
-      }
-      if (type == 10) {
+      // }
+      // if (type == 10) {
         //微课
         //  window.open(`${this.webBaseUrl}/course/micro?id=${id}`)
-        this.$router.push(`/course/micro?id=${id}`);
-      }
+      //   this.$router.push(`/course/micro?id=${id}`);
+      // }
     }
   }
 };
diff --git a/src/views/portal/user/Message.vue b/src/views/portal/user/Message.vue
index 1f77bb79..82caa2c4 100644
--- a/src/views/portal/user/Message.vue
+++ b/src/views/portal/user/Message.vue
@@ -287,11 +287,11 @@ export default {
       } else if (item.refType == 4||item.refType == 5) {
         return this.webBaseUrl + '/qa/answer?id=' + item.refId;
       } else {
-        if (item.conType == 10) {
-          return this.webBaseUrl + '/course/micro?id=' + item.refId;
-        } else if (item.conType == 20) {
+        // if (item.conType == 10) {
+        //   return this.webBaseUrl + '/course/micro?id=' + item.refId;
+        // } else if (item.conType == 20) {
           return this.webBaseUrl + '/course/detail?id=' + item.refId;
-        }
+        // }
       }
     }
   }
diff --git a/src/views/study/Courses.vue b/src/views/study/Courses.vue
index 8f1c4d18..32a565e4 100644
--- a/src/views/study/Courses.vue
+++ b/src/views/study/Courses.vue
@@ -312,16 +312,16 @@ computed: {
       if(item.isOld){
         location.href=`${this.webBaseUrl}/course/boeframe?id=${item.id}&type=${item.courseType}`
       } else {
-           if(item.courseType==10){
-            this.$router.push({path:'/course/micro',query:{id:item.courseId}})
-        }
-        if(item.courseType==20){
+        //    if(item.courseType==10){
+        //     this.$router.push({path:'/course/micro',query:{id:item.courseId}})
+        // }
+        // if(item.courseType==20){
           if(item.progress>0 && item.progress<100) {
             this.$router.push({path:'/course/studyindex',query:{id:item.courseId}})
           } else {
             this.$router.push({path:'/course/detail',query:{id:item.courseId}})
           }
-        }
+        // }
       }
 
 
diff --git a/src/views/study/FinishCourses.vue b/src/views/study/FinishCourses.vue
index 4266123b..7127b780 100644
--- a/src/views/study/FinishCourses.vue
+++ b/src/views/study/FinishCourses.vue
@@ -95,14 +95,14 @@ export default {
       this.params.courseType = ''
     },
     jumpRouter(item) {
-      if (item.courseType == 10) {
-        let routeData = this.$router.resolve({path: "/course/micro?id=" + item.courseId});
-        window.open(this.webBaseUrl+routeData.href, "_blank");
-      }
-      if (item.courseType == 20) {
+      // if (item.courseType == 10) {
+      //   let routeData = this.$router.resolve({path: "/course/micro?id=" + item.courseId});
+      //   window.open(this.webBaseUrl+routeData.href, "_blank");
+      // }
+      // if (item.courseType == 20) {
         let routeData = this.$router.resolve({ path: "/course/detail?id=" + item.courseId}); // , query: {  id: 1 }
         window.open(this.webBaseUrl+routeData.href, "_blank");
-      }
+      // }
     },
     handleSizeChange(val) {
       this.page.pageSize = val;
diff --git a/src/views/study/PortalIndex.vue b/src/views/study/PortalIndex.vue
index f06703fe..5eda8a1e 100644
--- a/src/views/study/PortalIndex.vue
+++ b/src/views/study/PortalIndex.vue
@@ -660,11 +660,11 @@ export default {
             }
           } else {
             this.$message.error('您还未报名');
-            if (this.courseInfo.type == 10) {
-              location.href = this.webBaseUrl + '/course/micro?id=' + this.courseId;
-            } else {
+            // 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);