diff --git a/src/views/circle/detail/components/newsList.vue b/src/views/circle/detail/components/newsList.vue index 4503a08..1f24a34 100644 --- a/src/views/circle/detail/components/newsList.vue +++ b/src/views/circle/detail/components/newsList.vue @@ -11,9 +11,9 @@ - - + /> + +
@@ -21,9 +21,13 @@ + >{{ item.userType === 1 ? "老师" : "助教" }}
- {{ item.readCount }}{{ item.totalCount }} + {{ item.readCount }}{{ item.totalCount }} 已读
@@ -32,19 +36,22 @@ v-if="type !== 5" type="success" @click="setMessageRecommend(item)" - >{{ - item.isRecommend === 1 ? "取消精选" : "设为精选" - }} + >{{ + item.isRecommend === 1 ? "取消精选" : "设为精选" + }} 引用 + >引用 通过审核 + >通过审核

{{ item.createTime }}

@@ -52,7 +59,7 @@

{{ item.content }}

- +
@@ -119,7 +126,7 @@ export default { Object.assign(this.msgIdsObj[msg.id], msg); } else if ( this.type === 1 || - (this.type === 2 && msg.userType === 1) || + (this.type === 2 && msg.userType !== 2) || (this.type === 4 && msg.isRecommend === 1) ) { // this.type === 4 && msg.isRecommend === 1 精选 diff --git a/src/views/circle/detail/index.vue b/src/views/circle/detail/index.vue index 2b076ee..cad1ee3 100644 --- a/src/views/circle/detail/index.vue +++ b/src/views/circle/detail/index.vue @@ -120,6 +120,7 @@ 搜索 + 刷新 @@ -380,6 +381,10 @@ export default { onSearch() { this.$refs[`newsListRef${this.msgType}`][0].searchMsg(this.msgKeyWord); }, + onRefresh() { + this.msgKeyWord = ""; + this.onSearch(); + }, handleGroupChatTopic(msg) { console.log("handleGroupChatTopic", msg); const body = JSON.parse(msg.body); diff --git a/src/views/circle/detail/mixins/webSocketConnect.js b/src/views/circle/detail/mixins/webSocketConnect.js index 04f4936..91ebb4f 100644 --- a/src/views/circle/detail/mixins/webSocketConnect.js +++ b/src/views/circle/detail/mixins/webSocketConnect.js @@ -22,8 +22,8 @@ export default { process.env.NODE_ENV === "development" ? "ws://8.138.144.54:8080/tgim/chat" : `${location.protocol === "http:" ? "ws://" : "wss://"}${ - location.host - }/tgim/chat`; + location.host + }/tgim/chat`; // 后端群组消息 const groupChatTopic = `/admin/group/topic/${id}`; // 私聊消息