活动状态返回修改。左侧侧边栏菜单修改。

donate-console/src/main/webapp/resources/js/index/app.js

@@ -564,10 +564,8 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'file-
     /**
      * 机构入驻选择
      */
-    app.controller('SelectInstitutionsNatureCtrl', ['$scope', 'toaster', 'Organization', '$location', 'AuthenticationService',
-        function ($scope, toaster, Organization, $location, AuthenticationService) {
-    app.controller('SelectInstitutionsNatureCtrl', ['$scope', 'toaster', 'Organization', '$location', 'BaseService', '$rootScope',
-        function ($scope, toaster, Organization, $location, BaseService, $rootScope) {
+    app.controller('SelectInstitutionsNatureCtrl', ['$scope', 'toaster', 'Organization', '$location', 'AuthenticationService', 'BaseService', '$rootScope',
+        function ($scope, toaster, Organization, $location, AuthenticationService, BaseService, $rootScope) {
             BaseService.scrollBackToTop();
             $rootScope.tree = 'user';
             $rootScope.thief = 'newOrg';
@@ -706,13 +704,11 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'file-
     /**
      * 机构入驻同意协议
      */
-    app.controller('CertificationStep0Ctrl', ['$scope', 'toaster', 'Organization', '$location', 'BaseService', '$rootScope',
-        function ($scope, toaster, Organization, $location, BaseService, $rootScope) {
+    app.controller('CertificationStep0Ctrl', ['$scope', 'toaster', 'Organization', '$location', 'AuthenticationService', 'BaseService', '$rootScope',
+        function ($scope, toaster, Organization, $location, AuthenticationService, BaseService, $rootScope) {
             BaseService.scrollBackToTop();
             $rootScope.tree = 'user';
             $rootScope.thief = 'newOrg';
-    app.controller('CertificationStep0Ctrl', ['$scope', 'toaster', 'Organization', '$location', 'AuthenticationService',
-        function ($scope, toaster, Organization, $location, AuthenticationService) {
             $scope.checked = true;
             $scope.changeChecked = function() {
                 $scope.checked = !$scope.checked;
@@ -755,8 +751,6 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'file-
      */
     app.controller('CertificationStep1Ctrl', ['$scope', 'BaseService', '$http', '$rootScope', '$timeout', '$location', '$filter', 'toaster', 'Organization', 'AuthenticationService',
         function ($scope, BaseService, $http, $rootScope, $timeout, $location, $filter, toaster, Organization, AuthenticationService) {
-    app.controller('CertificationStep1Ctrl', ['$scope', 'BaseService', '$http', '$rootScope', '$timeout', '$location', '$filter', 'toaster', 'Organization',
-        function ($scope, BaseService, $http, $rootScope, $timeout, $location, $filter, toaster, Organization) {
             BaseService.scrollBackToTop();
             $rootScope.tree = 'user';
             $rootScope.thief = 'newOrg';
@@ -868,9 +862,6 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'file-
      */
     app.controller('CertificationStep2Ctrl', ['$scope', 'BaseService', '$http', '$rootScope', '$timeout', '$location', 'toaster', 'Organization', 'AuthenticationService',
         function ($scope, BaseService, $http, $rootScope, $timeout, $location, toaster, Organization, AuthenticationService) {
-
-    app.controller('CertificationStep2Ctrl', ['$scope', 'BaseService', '$http', '$rootScope', '$timeout', '$location', 'toaster', 'Organization',
-        function ($scope, BaseService, $http, $rootScope, $timeout, $location, toaster, Organization) {
             BaseService.scrollBackToTop();
             $rootScope.tree = 'user';
             $rootScope.thief = 'newOrg';
@@ -943,8 +934,6 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'file-
      */
     app.controller('CertificationStep3Ctrl', ['$scope', '$http', '$rootScope', '$timeout', '$location', 'toaster', 'Organization', 'BaseService', 'AuthenticationService',
         function ($scope, $http, $rootScope, $timeout, $location, toaster, Organization, BaseService, AuthenticationService) {
-    app.controller('CertificationStep3Ctrl', ['$scope', '$http', '$rootScope', '$timeout', '$location', 'toaster', 'Organization', 'BaseService',
-        function ($scope, $http, $rootScope, $timeout, $location, toaster, Organization, BaseService) {
             BaseService.scrollBackToTop();
             $rootScope.tree = 'user';
             $rootScope.thief = 'newOrg';
@@ -1201,8 +1190,6 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'file-
     app.controller('PublicCertificationStep4Ctrl', ['$scope', 'BaseService', '$http', '$rootScope', '$timeout', '$location', 'toaster', 'Organization', 'AuthenticationService',
         function ($scope, BaseService, $http, $rootScope, $timeout, $location, toaster, Organization, AuthenticationService) {
 
-    app.controller('PublicCertificationStep4Ctrl', ['$scope', 'BaseService', '$http', '$rootScope', '$timeout', '$location', 'toaster', 'Organization',
-        function ($scope, BaseService, $http, $rootScope, $timeout, $location, toaster, Organization) {
             BaseService.scrollBackToTop();
             $rootScope.tree = 'user';
             $rootScope.thief = 'newOrg';