Authored by 陈轩

fix

... ... @@ -42,6 +42,13 @@ let uid = $('#js-uid').val();
let encryptedUid = $('#js-eid').val();
let userAvatar = $('#js-avatar').val() || socketConf.defaultUserHead;
// 客服配置
let customerService = {
head: socketConf.defaultUserHead,
name: ''
};
// 历史消息分页
let msgHistory = {
endTime: null,
... ... @@ -241,6 +248,8 @@ var chat = {
msg.uuid = uuid;
cmEntity.userHead = msg.avatar = userAvatar;
cmEntity.csHead = customerService.head;
cmEntity.csName = customerService.name;
cmEntity.uuid = uuid;
cmEntity.type = socketConf.recType.CU_SEND;
... ... @@ -277,12 +286,6 @@ var chat = {
return this;
},
sendPic: function() {
// 1. 渲染 dom, state loading
// 2. ajax done, show pic
// 2. ajax fail, show error
},
/**
* 处理 conversationMessage, 生成 渲染用的数据
*/
... ... @@ -298,7 +301,7 @@ var chat = {
break;
case allTypes.CS_SEND:
viewData.from = 'employee';
viewData.avatar = socketConf.defaultUserHead;
viewData.avatar = customerService.head || socketConf.defaultUserHead;
break;
case allTypes.ROBOT_SEND:
viewData.from = 'rebot';
... ... @@ -379,7 +382,7 @@ var chat = {
// 用户进入
case allTypes.ENTER:
if (chatMessage.type === 0) {
this._sysInfo(chatMessage.content);
this._sysInfo(chatMessage.newContent);
}
break;
... ... @@ -413,13 +416,17 @@ var chat = {
_manualState(state, cmEntity) {
const self = this;
const $chatHeader = self.$header;
const $chatWin = self.$chatWin;
const $chat = self.$chat;
const sysInfo = self._sysInfo.bind(this);
const chatMessage = cmEntity.chatMessage;
customerService.head = cmEntity.csHead;
customerService.name = cmEntity.csName;
function noService() {
$chatHeader.find('.js-service-txt').text('YOHO客服');
$chatWin.append(time(Date.now()).show());
$chat.append(time(Date.now()).show());
}
... ... @@ -434,11 +441,11 @@ var chat = {
function linkSuccess() {
$chatHeader.find('.js-service-txt').text('YOHO客服');
$chatWin
$chat
.toggleClass('online', true)
.append(time(Date.now).show());
.append(time(Date.now()).show());
sysInfo(`客服${cmEntity.csName}正在为您服务`);
sysInfo(chatMessage.content);
}
switch (state) {
... ... @@ -597,13 +604,6 @@ var chat = {
.find('.header-right').html(header.right);
return this;
},
// 刚进入提示
enterSuccess: function(chatMessage) {
append(time(Date.now()).show());
self._sysInfo();
self._sysInfo(chatMessage.content);
}
};
... ... @@ -689,3 +689,4 @@ $('#chat-window').on('click', '.chat-image', function() {
window.$ = $;
window.chat = chat;
window.cmEntity = cmEntity;
window.time = time;
\ No newline at end of file
... ...