diff --git a/app/index/controller/Index.php b/app/index/controller/Index.php index 88c48eec56d34f41c2db478a48f85aa90ce77ccd..58acc716f4aac4cae73c06883eda51e8de16ae1d 100755 --- a/app/index/controller/Index.php +++ b/app/index/controller/Index.php @@ -115,8 +115,8 @@ class Index extends Common $assign['images_magic_cube_view_list_show_style'] = BaseLayout::ConstData('images_magic_cube_view_list_show_style'); // 首页商品排序规则 - $assign['goods_order_by_type_list'] = MyLang('goods_order_by_type_list'); - $assign['goods_order_by_rule_list'] = MyLang('goods_order_by_rule_list'); + $assign['common_goods_order_by_type_list'] = MyConst('common_goods_order_by_type_list'); + $assign['common_goods_order_by_rule_list'] = MyConst('common_goods_order_by_rule_list'); // 浏览器名称 $assign['home_seo_site_title'] = SeoService::BrowserSeoTitle(MyLang('index.design_browser_seo_title'), 1); diff --git a/public/static/common/js/common.js b/public/static/common/js/common.js index 377779c696e10f04a41d5d7801e524937d25bb05..bcb198d7195dbdb0200e9898fb74311417b97a09 100755 --- a/public/static/common/js/common.js +++ b/public/static/common/js/common.js @@ -2643,14 +2643,17 @@ function ViewQrCodeInit () { */ function ViewDocumentTitleInit () { $('*').each(function (k, v) { - var title = $(this).attr('title') || null; - if (title !== null) { - $(this).popover({ - content: title, - trigger: 'hover focus', - theme: 'sm' - }); - $(this).removeAttr('title'); + if($(this).prop('tagName') != 'IMG') + { + var title = $(this).attr('title') || null; + if (title !== null) { + $(this).popover({ + content: title, + trigger: 'hover focus', + theme: 'sm' + }); + $(this).removeAttr('title'); + } } }); } diff --git a/public/static/common/lib/ueditor/ueditor.all.js b/public/static/common/lib/ueditor/ueditor.all.js index 77fce63122a3a241caddb89e81f78b92ccdd529a..81d9bf3e8ccf1262a2254947be8289cb1db1f7df 100755 --- a/public/static/common/lib/ueditor/ueditor.all.js +++ b/public/static/common/lib/ueditor/ueditor.all.js @@ -11174,7 +11174,6 @@ UE.commands['insertimage'] = { (ci.width ? 'width="' + ci.width + '" ' : '') + (ci.height ? ' height="' + ci.height + '" ' : '') + (ci['floatStyle'] == 'left' || ci['floatStyle'] == 'right' ? ' style="float:' + ci['floatStyle'] + ';"' : '') + - (ci.title && ci.title != "" ? ' title="' + ci.title + '"' : '') + (ci.border && ci.border != "0" ? ' border="' + ci.border + '"' : '') + (ci.alt && ci.alt != "" ? ' alt="' + ci.alt + '"' : '') + (ci.hspace && ci.hspace != "0" ? ' hspace = "' + ci.hspace + '"' : '') + @@ -11191,8 +11190,7 @@ UE.commands['insertimage'] = { (ci.width ? 'width="' + ci.width + '" ' : '') + (ci._src ? ' _src="' + ci._src + '" ' : '') + (ci.height ? ' height="' + ci.height + '" ' : '') + ' style="' + (ci['floatStyle'] && ci['floatStyle'] != 'center' ? 'float:' + ci['floatStyle'] + ';' : '') + - (ci.border || '') + '" ' + - (ci.title ? ' title="' + ci.title + '"' : '') + ' />

'; + (ci.border || '') + '" ' + ' />

'; html.push(str); } }