Merge remote-tracking branch 'origin/dev' into test

This commit is contained in:
joylink_fanyuhong 2020-03-11 19:55:32 +08:00
commit 5f3bc54a2a

View File

@ -516,7 +516,7 @@ const map = {
if (map && map.skinVO) { if (map && map.skinVO) {
state.map = map; state.map = map;
let showConfig = {}; let showConfig = {};
if (Vue.prototype.$jlmap) { if (Vue.prototype.$jlmap && ( typeof(Vue.prototype.$jlmap.getShowConfig) === 'function')) {
showConfig = Vue.prototype.$jlmap.getShowConfig(); showConfig = Vue.prototype.$jlmap.getShowConfig();
} }
state.mapDevice = parser(map, map.skinVO.code, showConfig); state.mapDevice = parser(map, map.skinVO.code, showConfig);