github/cosin
1
0
Fork 0
mirror of https://github.com/chatopera/cosin.git synced 2025-06-16 18:30:03 +08:00
Code Issues Releases Wiki Activity

Merge pull request #1035 from DevDengChao/fix/unable-to-remove-welcome-message

Browse Source 
feat: inviteData.dialog_message 为空白字符串时隐藏欢迎语占位符
This commit is contained in:
Hai Liang W. 2024-12-05 18:12:06 +08:00 committed by GitHub
commit a43572801a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
contact-center/app/src/main/resources/templates/admin/webim/profile.pug
View File

@ -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

17
contact-center/app/src/main/resources/templates/apps/im/index.pug
View File

@ -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) {

9
contact-center/app/src/main/resources/templates/apps/im/mobile.pug
View File

@ -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
});
}
}