Authored by 李奇

Merge branch 'feature/customerService' into gray

... ... @@ -419,9 +419,13 @@ function pageInit() {
// 用户头像处理
if (!rec.userHead) {
rec.userHead = assetsPrefix + socketConf.defaultUserHead;
} else {
rec.userHead = rec.userHead
.replace(/\{mode\}/, mode)
.replace(/\{width\}/, width)
.replace(/\{height\}/, height);
}
// 图片添加标签
if (msgType === 2) {
message.newContent = '<img class="img-msg" src="' + message.content + '">';
... ... @@ -479,9 +483,9 @@ function pageInit() {
if (msgType === 2) {
message.newContent = '<img class="img-msg" src="' + message.content + '">';
dom = cusTpl({
userHead: rec.userHead,
userName: rec.userName,
dom = csTpl({
csHead: rec.csHead,
csName: rec.csName,
sendTimeShort: rec.sendTimeShort,
newContent: message.newContent
});
... ... @@ -696,6 +700,7 @@ function pageInit() {
},
socketClosedCb: function() {
socketChat.clear();
offlineTip();
}
}));
... ... @@ -735,6 +740,11 @@ function pageInit() {
case allRTs.CU_SEND:
if (!item.userHead) {
item.userHead = assetsPrefix + socketConf.defaultUserHead;
} else {
item.userHead = item.userHead
.replace(/\{mode\}/, mode)
.replace(/\{width\}/, width)
.replace(/\{height\}/, height);
}
dom += cusTpl({
userHead: item.userHead,
... ...