接口字段更新

@@ -76,7 +76,6 @@ encryptedUid = $encryptedUid.val();
 assetsPrefix = $assetsPrefix.val();
 socketConfCM = socketConf.conversationMessage;
 socketConfCM.encryptedUid = encryptedUid;
-
 // 页面初始化
 function pageInit() {
 
@@ -200,15 +199,15 @@ function pageInit() {
             }
             socketConfCM.type = allRTs.CU_SEND;
             socketConfCM.uuid = uuid.v4();
-            socketConfCM.message.content = msg;
-            socketConfCM.message.type = msgType || 1;
+            socketConfCM.chatMessage.content = msg;
+            socketConfCM.chatMessage.type = msgType || 1;
             socketChat.send(socketConfCM);
             $area.val('');
         } else {
             socketConfCM.type = allRTs.CU_SEND;
             socketConfCM.uuid = uuid.v4();
-            socketConfCM.message.type = msgType || 1;
-            socketConfCM.message.content = msgContent;
+            socketConfCM.chatMessage.type = msgType || 1;
+            socketConfCM.chatMessage.content = msgContent;
             socketChat.send(socketConfCM);
         }
     }
@@ -489,17 +488,17 @@ function pageInit() {
                         isDouble: true,
                         id1: data[i].id,
                         id1Content: data[i].content,
-                        id2: data[i+1].id,
-                        id2Content: data[i+1].content
+                        id2: data[i + 1].id,
+                        id2Content: data[i + 1].content
                     });
                     i += 2;
                 }
             }
 
-            if(ceilRows > floorRows) {
+            if (ceilRows > floorRows) {
                 dom += disTpl({
-                    id: data[len-1].id,
-                    idContent: data[len-1].content,
+                    id: data[len - 1].id,
+                    idContent: data[len - 1].content,
                 });
             }
 
@@ -538,12 +537,11 @@ function pageInit() {
         var dom,
             tipContent,
             recType = rec.type,
-            message = rec.message,
+            message = rec.chatMessage,
             msgType = message.type,
             isHidden = tab.tabIsHidden(),
             allTypes = socketConf.recType;
 
-
         console.log('客户收到消息！', rec);
 
         // 删除上个定时器
@@ -635,12 +633,13 @@ function pageInit() {
         originConf.conversationMessage.sessionId = lastSessionId || 0;
         socketChat.init($.extend(originConf, {
             onMessage: function onMessage(e) {
+
                 var jsonString = e.data;
                 var received = JSON.parse(jsonString);
 
                 socketConfCM.conversationId = received.newConversationId !== 0 ?
-                                              received.newConversationId :
-                                              received.conversationId;
+                    received.newConversationId :
+                    received.conversationId;
 
                 // 保存会话id
                 window.setCookie('conversationId', socketConfCM.conversationId, {expires: 60 * 15});
@@ -684,12 +683,12 @@ function pageInit() {
         endTime = msgList[0].sendTime;
 
         if (hasMore) {
-            for(var i = 0, len = msgList.length; i < len; i++) {
+            for (var i = 0, len = msgList.length; i < len; i++) {
                 item = msgList[i];
-                item.message.newContent = emojiPrefix(item.message.newContent);
-                if (item.message.type === 2) {
-                    item.message.newContent =
-                        ['<img class="img-msg" src="', item.message.newContent, '">'].join('');
+                item.chatMessage.newContent = emojiPrefix(item.chatMessage.newContent);
+                if (item.chatMessage.type === 2) {
+                    item.chatMessage.newContent =
+                        ['<img class="img-msg" src="', item.chatMessage.newContent, '">'].join('');
                 }
 
                 switch (item.type) {
@@ -701,7 +700,7 @@ function pageInit() {
                             userHead: item.userHead,
                             userName: item.userName,
                             sendTimeShort: item.sendTimeShort,
-                            newContent: item.message.newContent
+                            newContent: item.chatMessage.newContent
                         });
                         break;
 
@@ -711,7 +710,7 @@ function pageInit() {
                             assetsPrefix: assetsPrefix,
                             csName: item.csName,
                             sendTimeShort: item.sendTimeShort,
-                            newContent: item.message.newContent
+                            newContent: item.chatMessage.newContent
                         });
                         break;
 
@@ -720,7 +719,7 @@ function pageInit() {
                             csHead: item.csHead,
                             csName: item.csName,
                             sendTimeShort: item.sendTimeShort,
-                            newContent: item.message.newContent
+                            newContent: item.chatMessage.newContent
                         });
                         break;
 
@@ -752,7 +751,7 @@ function pageInit() {
             type: 'GET',
             url: urls.msgHistory,
             data: data,
-            success: function (res) {
+            success: function(res) {
                 if (res && res.code === 200) {
                     hasMore && msgResolve(res.data);
                     $history.hide();
@@ -948,8 +947,8 @@ function pageInit() {
             if (res && res.code === 200) {
                 // 上传成功后发送图片消息
                 socketConfCM.type = allRTs.CU_SEND;
-                socketConfCM.message.content = res.data.filePath;
-                socketConfCM.message.type = 2;
+                socketConfCM.chatMessage.content = res.data.filePath;
+                socketConfCM.chatMessage.type = 2;
                 socketConfCM.uuid = uuid.v4();
                 socketChat.send(socketConfCM);
             }

@@ -47,8 +47,8 @@ var config = {
         serviceSortId: 0,
         serviceSortCode: '',
         customerSettingId: 0, // 预留字段，
-        roleId: 0,      // 0: 用户，1:客服
-        message: {
+        roleType: 0,      // 0: 用户，1:客服
+        chatMessage: {
             messageObjectId: '', // 没有用
             type: 0,            // 消息内容类型： 1:文本 2:图片 3:语音 4: 订单
             content: '',        // 客户端发送内容