11

dist/js/chat/index.js

@@ -56,7 +56,7 @@ $(function () {
                 } else {
                     console.log('添加聊天成员失败')
                 }
-            });
+            },false);
         },
         rendChatSection: function (data) {
             this.addUser({}, true);
@@ -242,9 +242,7 @@ $(function () {
         messageHtml: function (leftOrRight, html, isTemplate, isHistory, time) {
             //右边消息的dom拼接 isTemplate 是否是模板
             var htmlp = '<p>' + html.message + '</p>';
-
             var img = html.img || (dist + '/images/default.jpg')
-
             if (isTemplate) {
                 var htmlp = '<div class="template lineBlock boxsiz">' +
                     '<img src="' + (html.goodImage || dist + "/images/defaultgood.png") + '" alt="">' +
@@ -279,11 +277,10 @@ $(function () {
                 } else {
                     return ''
                 }
-
             } else { //左边
                 if (html) {
                     return '<div class = "notice_item left clr" > ' +
-                        '<img src="' + dist + '/images/default.jpg" alt="" class="fl user_logo">' +
+                        '<img src="' + img + '" alt="" class="fl user_logo">' +
                         '<div class="notice_content">' +
                         htmlp +
                         '<div>' + (isHistory ? time : this.curentTime()) + '</div>' +
@@ -300,28 +297,40 @@ $(function () {
             var regContent = "";
             var htmlStr = "";
             var self = this;
+            var emojiTxt = ""
             if (type == 1) {
                 if (isTemplate) {
                     regContent = message.type + ' ' + message.price;
                     htmlStr = message;
                 } else {
                     regContent = message.message;
-                    htmlStr = message.message;
+                    htmlStr = message;
                 }
             } else if (type == 2) {
                 regContent = '[图片]';
-                htmlStr = '<img src ="' + message.url + '" class="edit_img"/>';
+                htmlStr = {
+                    message:'<img src ="' + message.url + '" class="edit_img"/>',
+                    name: message.name,
+                    img: message.img,
+                    id: message.id 
+                }
             } else {
                 var data = message.message;
                 for (var i = 0, l = data.length; i < l; i++) {
                     if (data[i].type == 'emoji') {
                         regContent += '[表情]';
-                        htmlStr += '<img src ="' + data[i].data + '" width=25 height=25/>';
+                        emojiTxt += '<img src ="' + data[i].data + '" width=25 height=25/>';
                     } else {
                         regContent += data[i].data;
-                        htmlStr += data[i].data;
+                        emojiTxt += data[i].data;
                     }
                 };
+                htmlStr = {
+                    message:emojiTxt,
+                    name: message.name,
+                    img: message.img,
+                    id: message.id 
+                }
             }
             var len = $('.notice_classify').length;
             var messageSigleStr =
@@ -341,9 +350,9 @@ $(function () {
 
             if (!len) {
                 //新用户
-                var userStr = '<div class="notice_classify active" userid="' + message.to + '">' +
+                var userStr = '<div class="notice_classify active" userid="' + message.from + '">' +
                     self.userHtml(0, message, regContent) + '</div>';
-                var messageStr = '<div class="chat_item active" id="' + message.to + '">' +
+                var messageStr = '<div class="chat_item active" id="' + message.from + '">' +
                     messageSigleStr + '</div>'
                 $('.notice_left_content').append(userStr);
                 $('.chat_item_content').append(messageStr)
@@ -351,7 +360,7 @@ $(function () {
                 $('.notice_classify').each(function (index) {
                     var userId = $(this).attr('userid');
                     var isNowChat = $('.notice_classify').eq(index).hasClass('active');
-                    if (userId == message.to) {
+                    if (userId == message.from) {
                         //已有用户
                         if (isNowChat) {
                             //当前用户
@@ -365,9 +374,9 @@ $(function () {
                         } else {
                             //非当前用户
                             var num = Number($(this).find('.num').text());
-                            $(this).html(self.userHtml(num + 1, message.to, regContent));
-                            $('#' + userId).find('.notice_item_content').append(self.messageHtml(2,
-                                htmlStr, isTemplate));
+                            $(this).html(self.userHtml(num + 1, message, regContent));
+                            // $('#' + userId).find('.notice_item_content').append(self.messageHtml(2,
+                            //     htmlStr, isTemplate));
                         }
 
                         return false;
@@ -375,10 +384,10 @@ $(function () {
                         if (index == len - 1) {
                             //新用户
                             var userStr = '<div class="notice_classify" userid="' +
-                                message.to + '">' +
+                                message.from + '">' +
                                 self.userHtml(1, message, regContent) + '</div>';
                             var messageStr = '<div class="chat_item" id="' +
-                                message.to + '">' +
+                                message.from + '">' +
                                 messageSigleStr + '</div>'
                             $('.notice_left_content').append(userStr);
                             $('.chat_item_content').append(messageStr)
@@ -402,7 +411,7 @@ $(function () {
                         id: message.ext.id,
                         img: message.ext.img,
                         message: message.data,
-                        from: message.to
+                        from: message.from
                     }, false)
                 }, //收到文本消息;
                 onEmojiMessage: function (message) {
@@ -411,7 +420,7 @@ $(function () {
                         id: message.ext.id,
                         img: message.ext.img,
                         message: message.data,
-                        to: message.to,
+                        from: message.from,
                     }, false)
 
                 }, //收到表情消息;
@@ -420,7 +429,7 @@ $(function () {
                         name: message.ext.name,
                         id: message.ext.id,
                         img: message.ext.img,
-                        to: message.to,
+                        from: message.from,
                         type:message.ext.type,
                         price:message.ext.price,
                         goodImage:message.ext.goodImage,
@@ -442,8 +451,7 @@ $(function () {
                             name: message.ext.name,
                             id: message.ext.id,
                             img: message.ext.img,
-                            to: message.to,
-                            from: message.to,
+                            from: message.from,
                             url: message.url
                         }, false)
 
@@ -502,7 +510,6 @@ $(function () {
                 name: self.name,
                 img: self.img
             };
-            console.log(ext)
             msg.set({
                 msg: content, // 消息内容;
                 to: userId, // 接收消息对象;
@@ -544,7 +551,7 @@ $(function () {
                 action: "template",
                 ext: params,
                 success: function () {
-                    self.addChatMember(templateObj.id);
+                    self.addChatMember(templateObj.targetId);
                     $('#' + userId).find('.notice_item_content').append(self.messageHtml(1,
                         params, true));
                     var contentHeight = $('#' + userId).find('.notice_item_content')
@@ -674,7 +681,6 @@ $(function () {
                 queue: id,
                 count: '50',
                 success: function (data) {
-                    console.log(data)
                     self.rendHistoryMessage(id, data)
                     if (isTemplate) {
                         self.sendCmd(self.templateObj);