From 9c2f18dd31b5de3d952ae4ad72a561bee67f3d5e Mon Sep 17 00:00:00 2001 From: daihh Date: Thu, 10 Nov 2022 19:39:04 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B6=88=E6=81=AF=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Portal/interactBar.vue | 8 ++++---- src/views/portal/article/Detail.vue | 16 ++++++++++++++-- src/views/portal/case/Detail.vue | 14 +++++++++++++- src/views/portal/qa/Answer.vue | 3 +++ src/views/portal/qa/Detail.vue | 3 +++ src/views/portal/user/Message.vue | 23 ++++++++++++++--------- 6 files changed, 51 insertions(+), 16 deletions(-) diff --git a/src/components/Portal/interactBar.vue b/src/components/Portal/interactBar.vue index 28a5b22e..5b0134cc 100644 --- a/src/components/Portal/interactBar.vue +++ b/src/components/Portal/interactBar.vue @@ -235,7 +235,6 @@ export default { // if(type=='praise'){ // typeText='点赞了我的' // } - let content; let conType; if(this.type==1){ @@ -283,6 +282,9 @@ export default { content, refId, refType:this.type, + source:1, + pageUrl:location.href, + sendAid:this.userInfo.aid, sendName, acceptName, acceptId, @@ -291,9 +293,7 @@ export default { conType, } apiMessage.save(message).then(res=>{ - if(res.status==200){ - - } + if(res.status!=200){ console.log('发送消息失败') } }) }, checkHas(){ diff --git a/src/views/portal/article/Detail.vue b/src/views/portal/article/Detail.vue index e1f38439..8750de6a 100644 --- a/src/views/portal/article/Detail.vue +++ b/src/views/portal/article/Detail.vue @@ -54,7 +54,7 @@ 写文章
- +

贡献榜

    @@ -299,7 +299,19 @@ export default { }, success(value){ let content=this.userInfo.name+'评论了我的文章'+'-'+this.articleDetailData.title; - let query={refId:this.articleDetailData.id,sendType:1,title:'系统消息',refType:2,content:content,sendName:this.userInfo.name,acceptId:this.articleDetailData.sysCreateAid,acceptName:this.articleDetailData.sysCreateBy} + let query={ + refId:this.articleDetailData.id, + sendType:1, + title:'系统消息', + source:1, + pageUrl:location.href, + sendAid:this.userInfo.aid, + refType:2, + content:content, + sendName:this.userInfo.name, + acceptId:this.articleDetailData.sysCreateAid, + acceptName:this.articleDetailData.sysCreateBy, + } apiMessage.save(query).then(res=>{ if(res.status==200){ diff --git a/src/views/portal/case/Detail.vue b/src/views/portal/case/Detail.vue index c483eba5..e2bf1578 100644 --- a/src/views/portal/case/Detail.vue +++ b/src/views/portal/case/Detail.vue @@ -523,7 +523,19 @@ export default { }, success(value){ let content=this.userInfo.name+'评论了我的案例'+'-'+this.caseDetail.title; - let query={refId:this.caseDetail.id,sendType:1,title:'系统消息',refType:3,content:content,sendName:this.userInfo.name,accpetId:this.caseDetail.sysCreateAid,acceptName:this.caseDetail.sysCreateBy} + let query={ + refId:this.caseDetail.id, + sendType:1, + title:'系统消息', + refType:3, + source:1, + pageUrl:location.href, + sendAid:this.userInfo.aid, + content:content, + sendName:this.userInfo.name, + accpetId:this.caseDetail.sysCreateAid, + acceptName:this.caseDetail.sysCreateBy, + } apiMessage.save(query).then(res=>{ if(res.status==200){ diff --git a/src/views/portal/qa/Answer.vue b/src/views/portal/qa/Answer.vue index 566ed72a..b1302193 100644 --- a/src/views/portal/qa/Answer.vue +++ b/src/views/portal/qa/Answer.vue @@ -449,6 +449,9 @@ export default { let message = { refId: this.detailData.id, title: "系统消息", + source:1, + pageUrl:location.href, + sendAid:this.userInfo.aid, sendName: this.userInfo.name, acceptName: this.detailData.sysCreateBy, acceptId: this.detailData.sysCreateAid, diff --git a/src/views/portal/qa/Detail.vue b/src/views/portal/qa/Detail.vue index 924d13f7..30017810 100644 --- a/src/views/portal/qa/Detail.vue +++ b/src/views/portal/qa/Detail.vue @@ -349,6 +349,9 @@ export default { let message = { refId: this.detailData.id, title: "系统消息", + source:1, + pageUrl:location.href, + sendAid:this.userInfo.aid, sendName: this.userInfo.name, acceptName: this.detailData.sysCreateBy, acceptId: this.detailData.sysCreateAid, diff --git a/src/views/portal/user/Message.vue b/src/views/portal/user/Message.vue index e6872f0f..d3b37cde 100644 --- a/src/views/portal/user/Message.vue +++ b/src/views/portal/user/Message.vue @@ -293,17 +293,22 @@ export default { // 跳转详情事件11 returnRouter(item) { - if (item.refType == 2) { - return this.webBaseUrl + '/article/detail?id=' + item.refId; - } 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) { - return this.webBaseUrl + '/course/detail?id=' + item.refId; + if(item.pageUrl && item.pageUrl.length>10){ + return item.pageUrl; + }else{ + // if (item.refType == 2) { + // return this.webBaseUrl + '/article/detail?id=' + item.refId; + // } 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) { + // return this.webBaseUrl + '/course/detail?id=' + item.refId; + // // } // } } + } } };