diff --git a/src/components/Article/collectList.vue b/src/components/Article/collectList.vue index 0ec4cb2d..13c69315 100644 --- a/src/components/Article/collectList.vue +++ b/src/components/Article/collectList.vue @@ -7,11 +7,11 @@
{{ item.title }}
-
{{ item.summary }}
+
{{ item.summary || item.content}}
- 发布时间：{{ item.sysCreateTime | timeFilter }} - 收藏时间：{{ item.time | timeFilter }} + 发布时间：{{ item.sysCreateTime || item.publishTime | timeFilter }} + 收藏时间：{{ item.time || item.favoritesTime | timeFilter }} 取消收藏
@@ -46,9 +46,7 @@ export default { }, methods: { jump(item) { - // let routeData = this.$router.resolve({ path: '/article/detail?id=' + item.articleId }); // , query: { id: 1 } - // window.open(routeData.href, '_blank'); - this.$router.push({path:'/article/detail',query:{id:item.articleId}}) + this.$router.push({path:'/article/detail',query:{id:item.articleId || item.id}}) }, delItem(item) { this.$confirm('您确定要取消收藏所选文章吗？', '删除提示', { @@ -61,10 +59,10 @@ export default { }) .catch(() => {}); }, - jump(item){ - this.$router.push({path:'/article/detail',query:{id:item.articleId}}) - // window.open('/article/detail?id=' + item.articleId) - } + // jump(item){ + // this.$router.push({path:'/article/detail',query:{id:item.articleId}}) + // // window.open('/article/detail?id=' + item.articleId) + // } } }; diff --git a/src/components/Case/caseItems.vue b/src/components/Case/caseItems.vue index 3044d9ab..7dec60d5 100644 --- a/src/components/Case/caseItems.vue +++ b/src/components/Case/caseItems.vue @@ -67,7 +67,6 @@ export default { }, }, created() { - console.log(this.items) }, } diff --git a/src/components/Case/collectList.vue b/src/components/Case/collectList.vue index 866e4731..f1e0d115 100644 --- a/src/components/Case/collectList.vue +++ b/src/components/Case/collectList.vue @@ -8,17 +8,16 @@
- 取消收藏 + 取消收藏
- {{item.cases.summary}}
- 发布时间：{{ item.cases.sysCreateTime | timeFilter }} - 收藏时间：{{ item.time | timeFilter }} + 发布时间：{{ item.cases.sysCreateTime || item.publishTime | timeFilter }} + 收藏时间：{{ item.time || item.favoritesTime | timeFilter }}
diff --git a/src/components/Course/collectItem.vue b/src/components/Course/collectItem.vue index 80bbe847..0fe4dd70 100644 --- a/src/components/Course/collectItem.vue +++ b/src/components/Course/collectItem.vue @@ -12,7 +12,7 @@ {{ item.title }}
讲师：{{ item.authorName}}
-
收藏日期：{{ item.time }}
+
收藏日期：{{ item.time || item.favoritesTime}}
@@ -75,7 +75,12 @@ export default { coudetail(item) { // let routeData = this.$router.resolve({ path: '/course/detail?id=' + item.objId }); // window.open(routeData.href, '_blank'); - 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}}) + } + }, delItem(item) { this.$confirm('您确定要删除所选收藏吗？', '删除提示', { diff --git a/src/components/Qa/favoritesQaList.vue b/src/components/Qa/favoritesQaList.vue index 3c6ef986..9ef02669 100644 --- a/src/components/Qa/favoritesQaList.vue +++ b/src/components/Qa/favoritesQaList.vue @@ -16,8 +16,8 @@
- 发布时间：{{ item.question.sysCreateTime | timeFilter }} - 收藏时间：{{ item.time | timeFilter }} + 发布时间：{{ item.question.sysCreateTime || item.publishTime | timeFilter }} + 收藏时间：{{ item.time || item.favoritesTime | timeFilter }} 取消收藏
diff --git a/src/views/share/ToList.vue b/src/views/share/ToList.vue index 34ae2b33..eb5e317b 100644 --- a/src/views/share/ToList.vue +++ b/src/views/share/ToList.vue @@ -323,7 +323,7 @@ export default { if(item.type == 3){ item.cases = {title:'',summary:''}; item.cases.title=item.title; - item.cases.title=item.summary; + item.cases.summary=item.content; item.cases.id=item.id; } }); diff --git a/src/views/user/MyFavorites.vue b/src/views/user/MyFavorites.vue index 2d75e0fd..2e2ceb54 100644 --- a/src/views/user/MyFavorites.vue +++ b/src/views/user/MyFavorites.vue @@ -35,9 +35,10 @@ -->
- - - + + + +
@@ -102,10 +103,9 @@
-
+
{ + apiFavorite.queryAll(query).then(res=>{ if(res.status==200){ this.dataList.count=res.result.count if(res.result.length!=0){ @@ -395,7 +396,21 @@ export default { item.name='' item.orgInfo='' item.sex= null - courseIds.push(item.objId); + courseIds.push(item.id); + if(item.type == 4) { + item.question = {isResolve:false,title:'',content:'',bestAnswer:''}; + item.question.isResolve=item.isResolve; + 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.summary=item.content; + item.cases.id=item.id; + } }) this.loadCouserTeacher(res.result.list,courseIds); this.dataList.list = res.result.list; @@ -415,6 +430,9 @@ export default { if(item.objType==4){ ids.push(item.question.sysCreateAid) } + if(item.type){ + ids.push(item.authorId) + } }) let noRepeatIds = [...new Set(ids)]; apiUser.getByIds(noRepeatIds).then(res => { @@ -431,6 +449,11 @@ export default { return author.aid == item.question.sysCreateAid; }) } + if(item.type != 1){ + obj=res.result.find(author=>{ + return author.aid == item.authorId; + }) + } item=Object.assign(item, obj); }) // this.dataList.list = list.map(item => { @@ -494,16 +517,12 @@ export default { findCase() { let { pageIndex, pageSize } = this.caseList; let query = { pageIndex, pageSize }; - // if (this.caseList.cases.title) { - query.keyword = this.keyword.trim(); - // } + query.keyword = this.keyword.trim(); query.resolve = this.isRead; apiFavorite.casePageList(query).then(res => { if (res.status == 200) { - this.caseList.count = res.result.count; this.caseList.list = res.result.list; - console.log(this.caseList) if (this.caseList.list.length != 0) { this.getCaseUserData(res.result.list); }