From 079517072cfa4ebc2295f73de8d4fbe1873a24ae Mon Sep 17 00:00:00 2001
From: zhaofang <752743406@qq.com>
Date: Thu, 24 Nov 2022 14:43:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF=E7=9A=84=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/interact-bar/interact-bar.vue     | 27 +++++++++++++++-----
 components/interact-fixed/interact-fixed.vue |  2 ++
 components/system-news/system-news.vue       | 10 ++++----
 pages/resource/qaDetail.vue                  |  4 ++-
 4 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/components/interact-bar/interact-bar.vue b/components/interact-bar/interact-bar.vue
index b73b48a..dfb7881 100644
--- a/components/interact-bar/interact-bar.vue
+++ b/components/interact-bar/interact-bar.vue
@@ -27,6 +27,7 @@
 <script>
 	import apiStat from '@/api/phase2/stat.js'
 	import apiPraises from '@/api/modules/praises.js'
+	import apiMessage from '@/api/system/message.js'
 	import { mapGetters } from 'vuex';
 	export default {
 		props: {
@@ -78,6 +79,7 @@
 		},
 		data() {
 			return {
+				urlId:'',
 				loading:false,
                isPraise:false,
 			}
@@ -91,7 +93,9 @@
 		    }
 		  },
 		  mounted() {
+			  console.log(location.href.split('=')[1],'location.href,')
 		  	   this.checkHas();
+			   this.urlId = location.href.split('=')[1]
 		  	   // this.loadUser();
 		  },
 		computed:{
@@ -155,12 +159,17 @@
 			          content='案例评论'
 			        }
 			        // 评论点赞通知没有关联id,评论通知暂时关闭
-			        if(this.type==60 || this.type==10 || this.type==20 || this.type==30 || this.type == 6) {
-			          return;
+			        // if(this.type==60 || this.type==10 || this.type==20 || this.type==30 || this.type == 6) {
+			          // return;
 			          // content=sendName+typeText+content
-			        } else {
-			          content=sendName+typeText+content+'-'+title
-			        }
+			        // } else {
+					if(title) {
+						content=sendName+typeText+content+'-'+title
+					} else {
+						content=sendName+typeText+content
+					}
+			          
+			        // }
 			
 			
 			      let message={
@@ -168,7 +177,7 @@
 			        refId,
 			        refType:this.type,
 			        source:1,
-			        pageUrl:location.href,
+			        // pageUrl:location.href,
 			        sendAid:this.userInfo.aid,
 			        sendName,
 			        acceptName,
@@ -176,6 +185,12 @@
 			        title:'系统消息',
 			        sendType:1,
 			        conType,
+					source:1,
+					pageType:this.type,
+					pageParams:this.urlId,
+					// pageUrl:location.href,
+					 pageUrl:'',
+					sendAid:this.userInfo.aid,
 			      }
 			      apiMessage.save(message).then(res=>{
 			        if(res.status!=200){ console.log('发送消息失败') }
diff --git a/components/interact-fixed/interact-fixed.vue b/components/interact-fixed/interact-fixed.vue
index f072eee..1852e7e 100644
--- a/components/interact-fixed/interact-fixed.vue
+++ b/components/interact-fixed/interact-fixed.vue
@@ -199,6 +199,8 @@ export default {
 	          refType:this.type,
 	          sendName,
 	          acceptName,
+			  pageType:this.type,
+			  pageParams:refId,
 	          acceptId,
 	          title:'系统消息',
 	          sendType:1,
diff --git a/components/system-news/system-news.vue b/components/system-news/system-news.vue
index e10b13e..4e17a25 100644
--- a/components/system-news/system-news.vue
+++ b/components/system-news/system-news.vue
@@ -73,17 +73,17 @@
                     })
 				}
 				
-				if (item.refType == 2) {
+				if (item.pageType == 2 || item.pageType == 20) {
 					uni.navigateTo({
-						url: '/pages/resource/articeDetail?id=' + item.refId
+						url: '/pages/resource/articeDetail?id=' + item.pageParams
 					});
-				    } else if (item.refType == 4) {
+				    } else if (item.pageType == 4 || item.pageType == 40) {
 						uni.navigateTo({
-							url: '/pages/resource/qaDetail?id=' + item.refId
+							url: '/pages/resource/qaDetail?id=' + item.pageParams
 						});
 				} else {
 					uni.navigateTo({
-					 	url: '/pages/study/courseStudy?id='  + item.refId 
+					 	url: '/pages/study/courseStudy?id='  + item.pageParams 
 					});
 				  //   if (item.conType == '10') {
 						// uni.navigateTo({
diff --git a/pages/resource/qaDetail.vue b/pages/resource/qaDetail.vue
index 7632d96..50c23ed 100644
--- a/pages/resource/qaDetail.vue
+++ b/pages/resource/qaDetail.vue
@@ -530,7 +530,9 @@ export default {
 		    conType,
 			content,
 			source:1,
-			pageUrl:location.href,
+			pageType:4,
+			pageParams:this.questionId,
+			// pageUrl:location.href,
 			sendAid:this.userInfo.aid,
 		  }
 		  apiMessage.save(message).then(res=>{