mirror of
https://github.com/chatopera/cosin.git
synced 2025-07-24 08:31:45 +08:00
Merge pull request #708 from lecjy/osc-lecjy
系统设置->产品标题栏缩略小图配置完后,用户侧标题栏显示新配置的图标
This commit is contained in:
commit
94908547e2
@ -637,6 +637,7 @@ public class IMController extends Handler {
|
|||||||
}
|
}
|
||||||
|
|
||||||
ModelAndView view = request(super.createView("/apps/im/index"));
|
ModelAndView view = request(super.createView("/apps/im/index"));
|
||||||
|
view.addObject("systemConfig", MainUtils.getSystemConfig());
|
||||||
Optional<BlackEntity> blackOpt = cache.findOneBlackEntityByUserIdAndOrgi(userid, Constants.SYSTEM_ORGI);
|
Optional<BlackEntity> blackOpt = cache.findOneBlackEntityByUserIdAndOrgi(userid, Constants.SYSTEM_ORGI);
|
||||||
CousultInvite invite = OnlineUserProxy.consult(appid, orgi);
|
CousultInvite invite = OnlineUserProxy.consult(appid, orgi);
|
||||||
if (StringUtils.isNotBlank(
|
if (StringUtils.isNotBlank(
|
||||||
|
@ -20,10 +20,13 @@ html
|
|||||||
meta(name='viewport', content='width=device-width,maximum-scale=1,initial-scale=1,initial-scale=1,user-scalable=no')
|
meta(name='viewport', content='width=device-width,maximum-scale=1,initial-scale=1,initial-scale=1,user-scalable=no')
|
||||||
meta(name='apple-mobile-web-app-capable', content='yes')
|
meta(name='apple-mobile-web-app-capable', content='yes')
|
||||||
title 在线咨询
|
title 在线咨询
|
||||||
link(rel='shortcut icon', type='image/x-icon', href='/images/favicon.ico?t=1489039620156')
|
if systemConfig != null && systemConfig.favlogo != null
|
||||||
|
link(rel='shortcut icon', type='image/x-icon', href='/res/image.html?id=' + systemConfig.favlogo)
|
||||||
|
else
|
||||||
|
link(rel='shortcut icon', type='image/x-icon', href='/images/favicon.ico?t=1489039620156')
|
||||||
link(rel='stylesheet', type='text/css', href='/im/css/ukefu.css')
|
link(rel='stylesheet', type='text/css', href='/im/css/ukefu.css')
|
||||||
link#skin(rel='stylesheet', type='text/css', href='/im/css/default/ukefu.css')
|
link#skin(rel='stylesheet', type='text/css', href='/im/css/default/ukefu.css')
|
||||||
// kindeditor
|
// kindeditor
|
||||||
link(rel='stylesheet', type='text/css', href='/im/js/kindeditor/themes/default/default.css')
|
link(rel='stylesheet', type='text/css', href='/im/js/kindeditor/themes/default/default.css')
|
||||||
script(src='/js/jquery-1.10.2.min.js')
|
script(src='/js/jquery-1.10.2.min.js')
|
||||||
script(type='text/javascript', src='/im/js/kindeditor/kindeditor.js')
|
script(type='text/javascript', src='/im/js/kindeditor/kindeditor.js')
|
||||||
|
@ -19,7 +19,10 @@ html
|
|||||||
meta(name='viewport', content='width=device-width,maximum-scale=1,initial-scale=1,initial-scale=1,user-scalable=no')
|
meta(name='viewport', content='width=device-width,maximum-scale=1,initial-scale=1,initial-scale=1,user-scalable=no')
|
||||||
meta(name='apple-mobile-web-app-capable', content='yes')
|
meta(name='apple-mobile-web-app-capable', content='yes')
|
||||||
title 智能客服
|
title 智能客服
|
||||||
link(rel='shortcut icon', type='image/x-icon', href='/images/favicon.ico?t=1489039620156')
|
if systemConfig != null && systemConfig.favlogo != null
|
||||||
|
link(rel='shortcut icon', type='image/x-icon', href='/res/image.html?id=' + systemConfig.favlogo)
|
||||||
|
else
|
||||||
|
link(rel='shortcut icon', type='image/x-icon', href='/images/favicon.ico?t=1489039620156')
|
||||||
link(rel='stylesheet', type='text/css', href='/im/css/ukefu.css')
|
link(rel='stylesheet', type='text/css', href='/im/css/ukefu.css')
|
||||||
link#skin(rel='stylesheet', type='text/css', href='/im/css/default/ukefu.css')
|
link#skin(rel='stylesheet', type='text/css', href='/im/css/default/ukefu.css')
|
||||||
// kindeditor
|
// kindeditor
|
||||||
|
Loading…
x
Reference in New Issue
Block a user