diff --git a/src/components/Article/shareItems.vue b/src/components/Article/shareItems.vue index 19e694fb..c1137264 100644 --- a/src/components/Article/shareItems.vue +++ b/src/components/Article/shareItems.vue @@ -6,9 +6,9 @@ 【已查看】 【未查看】 - + -
+
@@ -72,7 +72,7 @@ export default { } }) } - this.$router.push({path:'/article/detail',query:{id:item.objId}}) + this.$router.push({path:'/article/detail',query:{id:item.objId || item.id}}) // window.open(`${this.webBaseUrl}/article/detail?id=${item.objId}`) }, deleteshares(item){ @@ -129,7 +129,7 @@ export default { font-weight: 400; display: flex; justify-content: flex-start; - + align-items: center; .readed{ font-size: 18px; diff --git a/src/components/Course/shareItem.vue b/src/components/Course/shareItem.vue index dd45b3b5..c40062a0 100644 --- a/src/components/Course/shareItem.vue +++ b/src/components/Course/shareItem.vue @@ -113,7 +113,12 @@ export default { } }) } - this.$router.push({path:'/course/detail',query:{id:item.objId}}) + 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}}) + } + // window.open(`${this.webBaseUrl}/course/detail?id=${item.objId}`) }, }, diff --git a/src/views/portal/case/Detail.vue b/src/views/portal/case/Detail.vue index 06ff0aa5..50deddab 100644 --- a/src/views/portal/case/Detail.vue +++ b/src/views/portal/case/Detail.vue @@ -42,7 +42,7 @@ - +
@@ -152,7 +152,6 @@ export default { }, data() { return { - // orginfo:'京东方科技集团股份有限公司/北京中祥英科技有限公司/技术中心/成都开发部', toUsers:[], ankingList:[], Popularity:[], @@ -169,7 +168,6 @@ export default { }; }, mounted() { - //this.pdfPath=this.basePath+'/case/demo1.pdf'; this.resolveId = this.$route.query.id; if (this.resolveId) { @@ -184,14 +182,6 @@ export default { ); }, methods: { - // info(){ - // if(this.orginfo){ - // let idx=this.orginfo.indexOf('/'); - // if(idx>-1){ - // this.orginfo=this.orginfo.substring(idx+1); - // } - // } - // }, createPlayUrl(u){ let nowDate=new Date(); let ctime=parseInt(nowDate.getTime()/1000); @@ -227,7 +217,6 @@ export default { apiCase.usernameList(5).then(res=>{ if(res.status==200){ this.ankingList=res.result - // console.log(res) } }) }, @@ -235,7 +224,6 @@ export default { apiCase.queryPraises(5).then(res=>{ if(res.status==200){ this.Popularity=res.result - // console.log(this.Popularity) } }) }, @@ -243,7 +231,6 @@ export default { apiCase.queryComments(5).then(res=>{ if(res.status==200){ this.Positive=res.result - console.log(res) } }) }, @@ -272,7 +259,7 @@ export default { let idx=this.authorInfo.orgInfo.indexOf('/'); if(idx>-1){ this.authorInfo.orgInfo=this.authorInfo.orgInfo.substring(idx+1); - } + } this.toUsers = [ {name: res.result[0].name, aid:res.result[0].aid ,sex:res.result[0].sex} ]; diff --git a/src/views/share/ToList.vue b/src/views/share/ToList.vue index d5336baf..34ae2b33 100644 --- a/src/views/share/ToList.vue +++ b/src/views/share/ToList.vue @@ -318,11 +318,13 @@ export default { item.question.title=item.title; item.question.content=item.content; item.question.bestAnswer=item.bestAnswer; + item.question.id=item.id; } if(item.type == 3){ item.cases = {title:'',summary:''}; item.cases.title=item.title; item.cases.title=item.summary; + item.cases.id=item.id; } }); this.dataList.list = res.result.list;