Merge remote-tracking branch 'origin/master'

src/views/portal/boeframe.vue

@@ -24,12 +24,12 @@ import portalFooter from "@/components/PortalFooter.vue";
       this.id = this.$route.query.id;
       this.type = this.$route.query.type;
       let urlPre=window.location.protocol+'//'+window.location.host;
-      
+
       let params='detailId='+this.id+'&inner=1';
       params=encodeURIComponent(params);
-      
+
       //console.log(urlPre,'urlPre');
-      if(this.type == 20 || this.type=='online-course') {//在线课
+      if(this.type == 20 || this.type=='online-course') {// 在线课
          this.url= `${urlPre}/web/onlineClass?detailId=${this.id}&inner=1`
       } else if(this.type == 30 || this.type=='face-course') {// 面授课
          this.url = `${urlPre}/web/f2fClass?detailId=${this.id}&inner=1`
@@ -37,9 +37,10 @@ import portalFooter from "@/components/PortalFooter.vue";
          this.url = `${urlPre}/web/learningProject?detailId=${this.id}&inner=1`
       } else if(this.type == 'quizsummary'){
          this.url = `${urlPre}/web/quizsummary?detailId=${this.id}&inner=1`
-      }else {// 如果没有type,学习任务页面
-         this.url = `${urlPre}/web/todo/detail?id=${this.id}&inner=1`
+      }else if(this.type==3) {// 如果没有type,学习任务页面
+         this.url = `${urlPre}/web/todo/detail?id=${this.cmtask_id}&inner=1`
       }
+      
     },
     methods:{
 

src/views/study/TaskList.vue

@@ -139,6 +139,9 @@ export default {
       }else if(item.cmtask_type==2){ //学习项目
          let params=encodeURIComponent('projectId='+item.cmtask_id);
          this.$router.push('/forward?to='+studentPath+'/projectdetails&params='+params);
+      }else if(item.cmtask_type==3){
+         let pushUrl=`${this.webBaseUrl}/course/boeframe?id=${item.cmtask_id}&type=3`;
+         this.$router.push(pushUrl);
       }
     },