diff --git a/contact-center/app/src/main/resources/templates/admin/webim/profile.pug b/contact-center/app/src/main/resources/templates/admin/webim/profile.pug index ae1721b8..5069eea9 100644 --- a/contact-center/app/src/main/resources/templates/admin/webim/profile.pug +++ b/contact-center/app/src/main/resources/templates/admin/webim/profile.pug @@ -77,7 +77,7 @@ block content .box-item .row .col-lg-12 - textarea.layui-input(name="dialog_message", autocomplete="off", oninput="$('#dialog_message').text($(this).val())", style="height:60px;line-height:22px;")= inviteData.dialog_message ? inviteData.dialog_message : '欢迎使用春松客服!如需帮助请联系 info@chatopera.com' + textarea.layui-input(name="dialog_message", autocomplete="off", oninput="$('#dialog_message').text($(this).val())", style="height:60px;line-height:22px;", placeholder="欢迎使用春松客服!如需帮助请联系 info@chatopera.com")= inviteData.dialog_message .ukefu-webim-prop .ukefu-webim-tl 7、自定义形象图片 (建议尺寸:276*236) .box-item(style="position: relative;") @@ -329,7 +329,8 @@ block content span(style="float:right;") i.layui-icon(style="font:size:12px;color:#ffffff;") ဆ .ukefu-im-preview-wrap(style="border:1px solid #EAEAEA") - #dialog_message.ukefu-im-preview-tip(style="width:90%;height:5px;font-size:12px;height:32px;overflow:hidden;border-radius: 10px;padding: 2px 10px 2px 10px;")= inviteData.dialog_message ? inviteData.dialog_message : '欢迎您来咨询!欢迎使用春松客服!如需帮助请联系 info@chatopera.com' + if inviteData.dialog_message != null && !inviteData.dialog_message.trim().isEmpty() + #dialog_message.ukefu-im-preview-tip(style="width:90%;height:5px;font-size:12px;height:32px;overflow:hidden;border-radius: 10px;padding: 2px 10px 2px 10px;")= inviteData.dialog_message ? inviteData.dialog_message : '欢迎您来咨询!欢迎使用春松客服!如需帮助请联系 info@chatopera.com' .ukefu-im-preview-customer i.layui-icon(style="color:#377FED;float:left;")  .ukefu-im-preview-customer-message.ukefu-im-preview-customer-arrow diff --git a/contact-center/app/src/main/resources/templates/apps/im/index.pug b/contact-center/app/src/main/resources/templates/apps/im/index.pug index cc1919e5..0082826e 100644 --- a/contact-center/app/src/main/resources/templates/apps/im/index.pug +++ b/contact-center/app/src/main/resources/templates/apps/im/index.pug @@ -63,7 +63,7 @@ html items: items, htmlTags: { - img: ['src', 'width', 'height', 'border', 'alt', 'title', 'align', '.width', '.height', '.border'], + img: ['src', 'width', 'height', 'border', 'alt', 'title', 'align', '.width', '.height', '.border'], br: [] }, afterChange: function () { @@ -100,9 +100,9 @@ html socket.emit('message', { appid: "#{appid}", userid: "#{userid}", - type: "writing", + type: "writing", session: "#{sessionid}", - message: strValue + message: strValue }); } words = this.count("text"); @@ -327,7 +327,7 @@ html $.ajax({ type: 'POST', url: "/im/image/upload.html?userid=#{userid}", - data: form, + data: form, processData: false, contentType: false }).done(function (data) { @@ -375,8 +375,9 @@ html div(style="padding:0px 5px 10px 5px;border-bottom:1px solid #dedede;") a#point_ad_text(href=welcomeAd.url, title=welcomeAd.tiptext, target="_blank")= welcomeAd.content - .clearfix.message.welcome - span#welcome-message= inviteData.dialog_message ? inviteData.dialog_message : '欢迎您来咨询!欢迎使用 Chatopera 云服务!如需帮助请联系 info@chatopera.com' + if inviteData.dialog_message != null && !inviteData.dialog_message.trim().isEmpty() + .clearfix.message.welcome + span#welcome-message= inviteData.dialog_message ? inviteData.dialog_message : '欢迎您来咨询!欢迎使用 Chatopera 云服务!如需帮助请联系 info@chatopera.com' if sessionConfig && sessionConfig.sessionmsg div(style='text-align:center;') @@ -639,9 +640,9 @@ html socket.emit('message', { appid: "#{appid}", userid: "#{userid}", - type: "message", + type: "message", session: "#{sessionid}", - message: message + message: message }); } } else if (service_end == true) { diff --git a/contact-center/app/src/main/resources/templates/apps/im/mobile.pug b/contact-center/app/src/main/resources/templates/apps/im/mobile.pug index f89a6d04..9c50fc34 100644 --- a/contact-center/app/src/main/resources/templates/apps/im/mobile.pug +++ b/contact-center/app/src/main/resources/templates/apps/im/mobile.pug @@ -217,8 +217,11 @@ html else div(style="padding:0px 5px 10px 5px;border-bottom:1px solid #dedede;") a#point_ad_text(href=welcomeAd.url, title=welcomeAd.tiptext, target="_blank")= welcomeAd.content - .clearfix.message.welcome - span#welcome-message= inviteData.dialog_message ? inviteData.dialog_message : '欢迎您来咨询!欢迎使用 Chatopera 云服务!如需帮助请联系 info@chatopera.com' + + if inviteData.dialog_message != null && !inviteData.dialog_message.trim().isEmpty() + .clearfix.message.welcome + span#welcome-message= inviteData.dialog_message ? inviteData.dialog_message : '欢迎您来咨询!欢迎使用 Chatopera 云服务!如需帮助请联系 info@chatopera.com' + for chatMessage in pugHelper.reverse(chatMessageList.content) if chatMessage.userid && userid && chatMessage.calltype && chatMessage.calltype == "呼入" .clearfix.chat-block @@ -587,7 +590,7 @@ html channel: "webim", type: "message", contextid: "#{sessionid}", - message: message + message:message }); } }