Merge branch 'wrdp' into 'develop'

Wrdp

See merge request o2oa/o2oa!2119

o2web/source/x_desktop/js/base.js

@@ -540,6 +540,7 @@ o2.addReady(function () {
             layout.session.user = data;
             layout.session.token = data.token;
             layout.desktop.session = layout.session;
+            _loadApp();
         }, function(){
             //允许匿名访问
             if (layout.anonymous) {
@@ -549,6 +550,7 @@ o2.addReady(function () {
                 layout.session.user = data;
                 layout.session.token = data.token;
                 layout.desktop.session = layout.session;
+                _loadApp();
             } else {
                 _loadProgressBar(true);
                 if (layout.yqwx) {
@@ -558,7 +560,6 @@ o2.addReady(function () {
                 }
             }
         });
-        _loadApp();
 
         // //先判断用户是否登录
         // o2.Actions.get("x_organization_assemble_authentication").getAuthentication(function (json) {