diff --git a/im/src/components/chat/panel/OtherLink.vue b/im/src/components/chat/panel/OtherLink.vue
index d5160d29..99dc4163 100644
--- a/im/src/components/chat/panel/OtherLink.vue
+++ b/im/src/components/chat/panel/OtherLink.vue
@@ -1,7 +1,7 @@
-
+
-
![]()
+
@@ -17,13 +18,14 @@
¥{{ item.price }}
+
+ 发送
+
-
- 发送
-
+
@@ -43,8 +45,8 @@
{{ item.groupName }}
- 发送
+ 发送
- 发送
@@ -169,7 +169,7 @@ export default {
.image {
height: 100px;
margin-top: 3px;
- width: 100px
+ width: 100px;
}
}
diff --git a/im/src/components/editor/MeEditor.vue b/im/src/components/editor/MeEditor.vue
index cc0605c0..742163c3 100644
--- a/im/src/components/editor/MeEditor.vue
+++ b/im/src/components/editor/MeEditor.vue
@@ -33,99 +33,66 @@
发起投票
-->
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
+
-
+
-
+
- {
- this.vote.isShow = false;
- }
- "
- />
+ {
+ this.vote.isShow = false;
+ }
+ " />
@@ -156,20 +123,20 @@ export default {
MeEditorVote,
},
computed: {
- talkUser() {
+ talkUser () {
return this.$store.state.dialogue.index_name;
},
- isGroupTalk() {
+ isGroupTalk () {
return this.$store.state.dialogue.talk_type == 2;
},
},
watch: {
- talkUser(n_index_name) {
+ talkUser (n_index_name) {
this.$refs.filesManager.clear();
this.editorText = this.getDraftText(n_index_name);
},
},
- data() {
+ data () {
return {
// 当前编辑的内容
editorText: "",
@@ -205,13 +172,13 @@ export default {
},
methods: {
// 读取对话编辑草稿信息 并赋值给当前富文本
- getDraftText(index_name) {
+ getDraftText (index_name) {
console.log("findTalk(index_name)", findTalk(index_name));
return findTalk(index_name)?.draft_text || "";
},
//复制粘贴图片回调方法
- pasteImage(e) {
+ pasteImage (e) {
let files = getPasteImgs(e);
if (files.length == 0) return;
@@ -219,19 +186,19 @@ export default {
},
//拖拽上传图片回调方法
- dragPasteImage(e) {
+ dragPasteImage (e) {
let files = getDragPasteImg(e);
if (files.length == 0) return;
this.openImageViewer(files[0]);
},
- inputEvent(e) {
+ inputEvent (e) {
this.$emit("keyboard-event", e.target.value);
},
// 键盘按下监听事件
- keydownEvent(e) {
+ keydownEvent (e) {
if (e.keyCode == 13 && this.editorText == "") {
e.preventDefault();
}
@@ -256,13 +223,13 @@ export default {
},
// 选择图片文件后回调方法
- uploadImageChange(e) {
+ uploadImageChange (e) {
this.openImageViewer(e.target.files[0]);
this.$refs.restFile.value = null;
},
// 选择文件回调事件
- uploadFileChange(e) {
+ uploadFileChange (e) {
let maxsize = 100 * 1024 * 1024;
if (e.target.files.length == 0) {
return false;
@@ -288,13 +255,13 @@ export default {
},
// 打开图片查看器
- openImageViewer(file) {
+ openImageViewer (file) {
this.imageViewer.isShow = true;
this.imageViewer.file = file;
},
// 代码块编辑器确认完成回调事件
- confirmCodeBlock(data) {
+ confirmCodeBlock (data) {
const { talk_type, receiver_id } = this.$store.state.dialogue;
ServeSendTalkCodeBlock({
talk_type,
@@ -315,7 +282,7 @@ export default {
},
// 确认上传图片消息回调事件
- confirmUploadImage() {
+ confirmUploadImage () {
let fileData = new FormData();
fileData.append("file", this.imageViewer.file);
@@ -340,7 +307,8 @@ export default {
},
// 选中表情包回调事件
- selecteEmoticon(data) {
+ selecteEmoticon (data) {
+ console.log(data);
if (data.type == 1) {
let value = this.editorText;
let el = this.$refs.textarea;
@@ -362,6 +330,8 @@ export default {
}
} else {
const { talk_type, receiver_id } = this.$store.state.dialogue;
+ console.log(talk_type);
+ console.log(receiver_id);
ServeSendEmoticon({
talk_type,
receiver_id,
diff --git a/im/src/components/layout/WelcomeModule.vue b/im/src/components/layout/WelcomeModule.vue
index 7d2fa6c0..cc9d3e79 100644
--- a/im/src/components/layout/WelcomeModule.vue
+++ b/im/src/components/layout/WelcomeModule.vue
@@ -2,7 +2,6 @@

-
@@ -10,10 +9,10 @@
diff --git a/im/src/im-server/event/talk.js b/im/src/im-server/event/talk.js
index ddc61385..52d487d9 100644
--- a/im/src/im-server/event/talk.js
+++ b/im/src/im-server/event/talk.js
@@ -46,9 +46,9 @@ class Talk extends Base {
this.resource = resource;
// 判断发送者消息是否在当前用户列表中
- if(this.sender_id && !vm.$store.state.talks.items.find(item=>{
+ if (this.sender_id && !vm.$store.state.talks.items.find(item => {
return item.userId == this.sender_id
- })){
+ })) {
// 没有当前用户,未在当前列表 进行重新加载
vm.loadUserSetting('update')
}
@@ -58,7 +58,7 @@ class Talk extends Base {
* 判断消息发送者是否来自于我
* @returns
*/
- isCurrSender() {
+ isCurrSender () {
// console.log("sender_id", this.sender_id);
return this.sender_id == this.getAccountId();
}
@@ -68,7 +68,7 @@ class Talk extends Base {
*
* @return String
*/
- getIndexName() {
+ getIndexName () {
if (this.talk_type == 2) {
return `${this.talk_type}_${this.receiver_id}`;
}
@@ -83,7 +83,7 @@ class Talk extends Base {
*
* @returns
*/
- getFloatType() {
+ getFloatType () {
let userId = this.resource.userId;
if (userId == 0) return "center";
@@ -94,18 +94,21 @@ class Talk extends Base {
/**
* 获取聊天列表左侧的对话信息
*/
- getTalkText() {
+ getTalkText () {
let text = this.resource.content || this.resource.text;
switch (this.resource.msg_type) {
case 'GOODS':
text = "[商品链接]";
break;
+ case 'ORDERS':
+ text = "[订单链接]";
+ break;
}
return text;
}
- handle() {
+ handle () {
let store = this.getStoreInstance();
// console.log("触发handle");
// 判断当前是否在聊天页面
@@ -131,7 +134,7 @@ class Talk extends Base {
* 显示消息提示
* @returns
*/
- showMessageNocice() {
+ showMessageNocice () {
let avatar = this.resource.avatar;
let nickname = this.resource.nickname;
let talk_type = this.resource.talk_type;
@@ -167,7 +170,7 @@ class Talk extends Base {
/**
* 加载对接节点
*/
- addTalkItem() {
+ addTalkItem () {
let receiver_id = this.sender_id;
let talk_type = this.talk_type;
@@ -188,7 +191,7 @@ class Talk extends Base {
/**
* 插入对话记录
*/
- insertTalkRecord() {
+ insertTalkRecord () {
let store = this.getStoreInstance();
let record = this.resource;
// console.log("插入谈话记录", record);
@@ -238,7 +241,7 @@ class Talk extends Base {
/**
* 更新对话列表记录
*/
- updateTalkItem() {
+ updateTalkItem () {
let store = this.getStoreInstance();
store.commit("INCR_UNREAD_NUM");
diff --git a/im/src/plugins/ws-socket.js b/im/src/plugins/ws-socket.js
index 802d0b17..e7516700 100644
--- a/im/src/plugins/ws-socket.js
+++ b/im/src/plugins/ws-socket.js
@@ -65,7 +65,6 @@ class WsSocket {
*/
on (event, callBack) {
// 对应 socket-instance.js
- console.log("事件绑定", event, callBack);
this.onCallBacks[event] = callBack;
return this;
}
diff --git a/im/src/store/modules/talk.js b/im/src/store/modules/talk.js
index 10882241..d52847d4 100644
--- a/im/src/store/modules/talk.js
+++ b/im/src/store/modules/talk.js
@@ -21,7 +21,6 @@ const Talk = {
getters: {
// 过滤所有置顶对话列表
topItems: (state) => {
- console.log(state.items, 'state.items');
return state.items.filter((item) => item.is_top == 1);
},
talkItems: (state) => {
@@ -40,7 +39,6 @@ const Talk = {
mutations: {
// 设置对话列表
SET_TALK_ITEMS (state, resource) {
- console.log("设置对话列表", resource.items);
Vue.set(state, 'items', resource.items)
},
diff --git a/im/src/utils/talk.js b/im/src/utils/talk.js
index 2322882d..b8c12920 100644
--- a/im/src/utils/talk.js
+++ b/im/src/utils/talk.js
@@ -10,7 +10,7 @@ const KEY_INDEX_NAME = "send_message_index_name";
*
* @param {String} index_name
*/
-export function findTalkIndex(index_name) {
+export function findTalkIndex (index_name) {
return store.state.talks.items.findIndex(
(item) => item.index_name == index_name
);
@@ -21,7 +21,7 @@ export function findTalkIndex(index_name) {
*
* @param {String} index_name
*/
-export function findTalk(index_name) {
+export function findTalk (index_name) {
return store.state.talks.items.find((item) => item.index_name == index_name);
}
@@ -30,8 +30,7 @@ export function findTalk(index_name) {
*
* @param {Object} params
*/
-export function formatTalkItem(params) {
- console.log(params);
+export function formatTalkItem (params) {
let options = {
id: "",
disable: false,
@@ -58,7 +57,7 @@ export function formatTalkItem(params) {
* @param {Integer} talk_type 对话类型[1:私聊;2:群聊;]
* @param {Integer} receiver_id 接收者ID
*/
-export function toTalk(talk_type, receiver_id) {
+export function toTalk (talk_type, receiver_id) {
ServeCreateTalkList(receiver_id).then(({ code, data }) => {
console.log("ServeCreateTalkList", data);
if (code == 200) {
@@ -78,7 +77,7 @@ export function toTalk(talk_type, receiver_id) {
*
* @returns
*/
-export function getCacheIndexName() {
+export function getCacheIndexName () {
let index_name = sessionStorage.getItem(KEY_INDEX_NAME);
if (index_name) {
sessionStorage.removeItem(KEY_INDEX_NAME);
diff --git a/im/src/views/message/index.vue b/im/src/views/message/index.vue
index f56f8eba..f5a869ca 100644
--- a/im/src/views/message/index.vue
+++ b/im/src/views/message/index.vue
@@ -80,8 +80,8 @@
{{
- item.remark_name ? item.remark_name : item.name
-}}
+ item.remark_name ? item.remark_name : item.name
+ }}
{{ item.unread }}条未读
@@ -112,8 +112,8 @@
+ index_name != item.index_name && item.draft_text
+ ">
[草稿]
{{ item.draft_text }}
@@ -424,7 +424,6 @@ export default {
this.$nextTick(() => {
if (id == this.index_name.split("_")[1]) {
- console.log("已读");
this.$store.commit("UPDATE_TALK_ITEM", {
userId: id,
index_name: "MESSAGE_" + this.index_name.split("_")[1],