From 23f83b3557fd851ae7fa14363eae3259b8e7930d Mon Sep 17 00:00:00 2001 From: DevDengChao <2325690622@qq.com> Date: Thu, 5 Dec 2024 16:21:58 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:=20inviteData.dialog=5Fmessage=20?= =?UTF-8?q?=E4=B8=BA=E7=A9=BA=E7=99=BD=E5=AD=97=E7=AC=A6=E4=B8=B2=E6=97=B6?= =?UTF-8?q?=E9=9A=90=E8=97=8F=E6=AC=A2=E8=BF=8E=E8=AF=AD=E5=8D=A0=E4=BD=8D?= =?UTF-8?q?=E7=AC=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: DevDengChao <2325690622@qq.com> --- .../templates/admin/webim/profile.pug | 5 +++-- .../resources/templates/apps/im/index.pug | 19 ++++++++++--------- .../resources/templates/apps/im/mobile.pug | 11 +++++++---- 3 files changed, 20 insertions(+), 15 deletions(-) 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..7b97ab08 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 @@ -56,14 +56,14 @@ html fontsize: 16, newlineTag: "br", uploadJson: "/im/image/upload.html?userid=#{userid}", - allowFileManager: false, + false, allowInsertUpload: false, //增加的参数，上传图片后是否插入到当前区域 allowImageRemote: false, filterMode: true, items: items, htmlTags: { - img: ['src', 'width', 'height', 'border', 'alt', 'title', 'align', '.width', '.height', '.border'], + ['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", + "writing", session: "#{sessionid}", - message: strValue + strValue }); } words = this.count("text"); @@ -327,7 +327,7 @@ html $.ajax({ type: 'POST', url: "/im/image/upload.html?userid=#{userid}", - data: form, + 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", + "message", session: "#{sessionid}", - 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..d2ea818a 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 @@ -584,10 +587,10 @@ html appid: "#{appid}", userid: "#{userid}", username: "#{username}", - channel: "webim", + "webim", type: "message", contextid: "#{sessionid}", - message: message + message }); } } From 307229e9d1b2cd305b9a0be8ab6b1eda4b00df2c Mon Sep 17 00:00:00 2001 From: DevDengChao <2325690622@qq.com> Date: Thu, 5 Dec 2024 16:49:21 +0800 Subject: [PATCH 2/2] fix: missing field Signed-off-by: DevDengChao <2325690622@qq.com> --- .../src/main/resources/templates/apps/im/index.pug | 14 +++++++------- .../main/resources/templates/apps/im/mobile.pug | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) 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 7b97ab08..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 @@ -56,14 +56,14 @@ html fontsize: 16, newlineTag: "br", uploadJson: "/im/image/upload.html?userid=#{userid}", - false, + allowFileManager: false, allowInsertUpload: false, //增加的参数，上传图片后是否插入到当前区域 allowImageRemote: false, filterMode: true, items: items, htmlTags: { - ['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}", - "writing", + type: "writing", session: "#{sessionid}", - strValue + message: strValue }); } words = this.count("text"); @@ -327,7 +327,7 @@ html $.ajax({ type: 'POST', url: "/im/image/upload.html?userid=#{userid}", - form, + data: form, processData: false, contentType: false }).done(function (data) { @@ -640,9 +640,9 @@ html socket.emit('message', { appid: "#{appid}", userid: "#{userid}", - "message", + type: "message", session: "#{sessionid}", - 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 d2ea818a..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 @@ -587,10 +587,10 @@ html appid: "#{appid}", userid: "#{userid}", username: "#{username}", - "webim", + channel: "webim", type: "message", contextid: "#{sessionid}", - message + message:message }); } }