Merge branch 'cherry-pick-d6e2dc07' into 'develop'

修复语言包获取错误的问题 See merge request o2oa/o2oa!2611

Merge branch 'cherry-pick-d6e2dc07' into 'develop'
修复语言包获取错误的问题 See merge request o2oa/o2oa!2611
676f4267 · NoSubject · 7ea8f323 · 3668320a · 676f4267
显示空白变更内容
内联并排

Showing with 13 addition and 14 deletion

o2web/source/x_desktop/js/base_loader.js o2web/source/x_desktop/js/base_loader.js +13 -14

未找到文件。
--- a/o2web/source/x_desktop/js/base_loader.js
+++ b/o2web/source/x_desktop/js/base_loader.js
@@ -324,20 +324,19 @@ if (!layout.isReady) {
            } else {
                loadModuls();
            }
+            //
-            if (!o2.LP) {
+            // if (!o2.LP) {
-                console.log('load lp .... ');
+            //     o2.load(lp, function(m){
-                o2.load(lp, function(m){
+            //         if (!m.length){
-                    if (!m.length){
+            //             var lp = "../o2_core/o2/lp/" + o2.language + ((o2.session.isDebugger) ? "" : ".min") + ".js?v="+o2.version.v;
-                        var lp = "../o2_core/o2/lp/" + o2.language + ((o2.session.isDebugger) ? "" : ".min") + ".js?v="+o2.version.v;
+            //             o2.load(lp,loadModuls);
-                        o2.load(lp,loadModuls);
+            //         }else{
-                    }else{
+            //             loadModuls();
-                        loadModuls();
+            //         }
-                    }
+            //     });
-                });
+            // } else {
-            } else {
+            //     loadModuls();
-                loadModuls();
+            // }
-            }
            _loadProgressBar();
            if (config.proxyCenterEnable){