机构入驻提交表单增加等待提示

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

@@ -565,6 +565,7 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'file-
      */
     app.controller('SelectInstitutionsNatureCtrl', ['$scope', 'toaster', 'Organization', '$location', 'AuthenticationService',
         function ($scope, toaster, Organization, $location, AuthenticationService) {
+            $scope.loading = true;
             // 获取当前账户注册机构情况
             AuthenticationService.getAuthentication().success(function (data) {
                 if (data.content) {
@@ -574,17 +575,14 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'file-
                         $scope.org = data;
                     }, function() {
                         toaster.pop('error', '注册情况加载失败');
+                        $scope.loading = false;
                     });
                 }
                 if (data == null || !data.content) {
                     //$scope.isAuthed = false;
                     AuthenticationService.redirectSignin();
                 }
-            });
-            Organization.getByUuid({uuid : $scope.userUU}, {}, function(data) {//10041558
-                $scope.org = data;
-            }, function() {
-                toaster.pop('error', '注册情况加载失败');
+                $scope.loading = false;
             });
 
             //公益机构注册
@@ -702,6 +700,7 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'file-
      */
     app.controller('CertificationStep0Ctrl', ['$scope', 'toaster', 'Organization', '$location', 'AuthenticationService',
         function ($scope, toaster, Organization, $location, AuthenticationService) {
+            $scope.loading = true;
             $scope.checked = true;
             $scope.changeChecked = function() {
                 $scope.checked = !$scope.checked;
@@ -729,12 +728,14 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'file-
                         $scope.checked = true;
                     }, function() {
                         toaster.pop('error', '注册情况加载失败');
+                        $scope.loading = false;
                     });
                 }
                 if (data == null || !data.content) {
                     //$scope.isAuthed = false;
                     AuthenticationService.redirectSignin();
                 }
+                $scope.loading = false;
             });
 
         }]);
@@ -744,6 +745,7 @@ 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) {
+            $scope.loading = true;
             // 主要领域
             // $scope.areas = ['疾病援助', '扶贫/救灾', '教育/助学' , '环境/动物保护', '其他'];
             $scope.org = {
@@ -764,6 +766,7 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'file-
                         $scope.org = data;
                         orgCopy = angular.copy($scope.org);
                     }, function() {
+                        $scope.loading = false;
                         toaster.pop('error', '注册情况加载失败');
                     });
                 }
@@ -771,6 +774,7 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'file-
                     //$scope.isAuthed = false;
                     AuthenticationService.redirectSignin();
                 }
+                $scope.loading = false;
             });
 
             // 获取地址信息
@@ -797,9 +801,11 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'file-
 
             //提交
             $scope.saveStep1 = function (org, orgType, invalid) {
+                $scope.loading = true;
                 if (invalid == true) {
                     $scope.submited = true;
                     BaseService.scrollBackToTop();
+                    $scope.loading = false;
                     return;
                 }
                 if (orgCopy == org) {
@@ -834,6 +840,7 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'file-
                         if (data.error) {
                             toaster.pop('error', '提示', data.error);
                         }
+                        $scope.loading = false;
 
                     }).error(function (data, status) {
                         $scope.loadingShow = false;
@@ -842,6 +849,7 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'file-
                         } else {
                             toaster.pop('error', '操作失败', data.error);
                         }
+                        $scope.loading = false;
                     });
                 }
             };
@@ -852,7 +860,7 @@ 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) {
-
+            $scope.loading = true;
             var orgCopy;
             // 获取当前账户注册机构情况
             AuthenticationService.getAuthentication().success(function (data) {
@@ -863,6 +871,7 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'file-
                         $scope.org = data;
                         orgCopy = angular.copy($scope.org);
                     }, function() {
+                        $scope.loading = false;
                         toaster.pop('error', '注册情况加载失败');
                     });
                 }
@@ -870,13 +879,16 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'file-
                     //$scope.isAuthed = false;
                     AuthenticationService.redirectSignin();
                 }
+                $scope.loading = false;
             });
 
             //提交
             $scope.saveStep2 = function (org, orgType, invalid) {
+                $scope.loading = true;
                 if (invalid == true) {
                     $scope.submited = true;
                     BaseService.scrollBackToTop();
+                    $scope.loading = false;
                     return;
                 }
 
@@ -904,6 +916,7 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'file-
                         if (data.error) {
                             toaster.pop('error', '提示', data.error);
                         }
+                        $scope.loading = false;
 
                     }).error(function (data, status) {
                         $scope.loadingShow = false;
@@ -912,6 +925,8 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'file-
                         } else {
                             toaster.pop('error', '操作失败', data.error);
                         }
+                        $scope.loading = false;
+
                     });
                 }
             };
@@ -922,6 +937,7 @@ 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) {
+            $scope.loading = true;
             var orgCopy;
             // 获取当前账户注册机构情况
             AuthenticationService.getAuthentication().success(function (data) {
@@ -941,12 +957,14 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'file-
                         orgCopy = angular.copy($scope.org);
                     }, function() {
                         toaster.pop('error', '注册情况加载失败');
+                        $scope.loading = false;
                     });
                 }
                 if (data == null || !data.content) {
                     //$scope.isAuthed = false;
                     AuthenticationService.redirectSignin();
                 }
+                $scope.loading = false;
             });
 
             if (angular.isUndefined($scope.org)) {
@@ -1014,6 +1032,7 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'file-
 
             // 图片上传
             $scope.fileChanged = function(ele, order){
+                $scope.loading = true;
                 if (order == 0) {
                     $scope.logo = ele.files[0];
                     $scope.logoUrl = getObjectURL($scope.logo);
@@ -1027,11 +1046,13 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'file-
                     $scope.legalIdCard = ele.files[0];
                     $scope.legalIdCardUrl = getObjectURL($scope.legalIdCard);
                 }
+                $scope.loading = false;
                 $scope.$apply();
             };
 
             // 查看范例
             $scope.showImg = function (type) {
+                $scope.loading = true;
                 var img = null;
                 var imgUrl = null;
                 switch (type) {
@@ -1073,6 +1094,7 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'file-
                         box.hide();
                     });
                 }
+                $scope.loading = false;
             };
 
             // 删除
@@ -1108,9 +1130,11 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'file-
 
             //提交
             $scope.saveStep3 = function (org, isDraft, orgType, invalid) {
+                $scope.loading = true;
                 if (invalid == true) {
                     $scope.submited = true;
                     BaseService.scrollBackToTop();
+                    $scope.loading = false;
                     return;
                 }
 
@@ -1156,6 +1180,7 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'file-
                         if (data.error) {
                             toaster.pop('error', '提示', data.error);
                         }
+                        $scope.loading = false;
 
                     }).error(function (data, status) {
                         $scope.loadingShow = false;
@@ -1164,6 +1189,8 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'file-
                         } else {
                             toaster.pop('error', '操作失败', data.error);
                         }
+                        $scope.loading = false;
+
                     });
                 }
             };
@@ -1174,7 +1201,7 @@ 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) {
-
+            $scope.loading = true;
             var orgCopy;
             // 获取当前账户注册机构情况
             AuthenticationService.getAuthentication().success(function (data) {
@@ -1192,12 +1219,14 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'file-
                         orgCopy = angular.copy($scope.org);
                     }, function() {
                         toaster.pop('error', '注册情况加载失败');
+                        $scope.loading = false;
                     });
                 }
                 if (data == null || !data.content) {
                     //$scope.isAuthed = false;
                     AuthenticationService.redirectSignin();
                 }
+                $scope.loading = false;
             });
 
             if (angular.isUndefined($scope.org)) {
@@ -1220,6 +1249,7 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'file-
 
             // 图片上传
             $scope.fileChanged = function(ele, order){
+                $scope.loading = true;
                 if (order == 0) {
                     $scope.material = ele.files[0];
                     $scope.materialUrl = getObjectURL($scope.material);
@@ -1228,10 +1258,12 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'file-
                     $scope.certifyUrl = getObjectURL($scope.certify);
                 }
                 $scope.$apply();
+                $scope.loading = false;
             };
 
             // 查看范例
             $scope.showImg = function (type) {
+                $scope.loading = true;
                 var img = null;
                 var imgUrl = null;
                 switch (type) {
@@ -1265,6 +1297,7 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'file-
                         box.hide();
                     });
                 }
+                $scope.loading = false;
             };
 
             // 删除
@@ -1292,9 +1325,11 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'file-
 
             //提交
             $scope.saveStep4 = function (org, isDraft, invalid) {
+                $scope.loading = true;
                 if (invalid == true) {
                     $scope.submited = true;
                     BaseService.scrollBackToTop();
+                    $scope.loading = false;
                     return;
                 }
 
@@ -1330,6 +1365,7 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'file-
                         if (data.error) {
                             toaster.pop('error', '提示', data.error);
                         }
+                        $scope.loading = false;
 
                     }).error(function (data, status) {
                         $scope.loadingShow = false;
@@ -1338,6 +1374,7 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'file-
                         } else {
                             toaster.pop('error', '操作失败', data.error);
                         }
+                        $scope.loading = false;
                     });
                 }
             };

donate-console/src/main/webapp/resources/view/user/charityCertification.html

@@ -380,6 +380,9 @@
         color: #1968f9;
     }
 </style>
+<!-- loading start -->
+<div class="loading in" ng-class="{'in': loading}"><i></i></div>
+<!-- loading end -->
 <!--主体内容-->
 <div class="content-wrapper" style="min-height: 924px;; z-index: 50;">
     <!-- Main content -->

donate-console/src/main/webapp/resources/view/user/charityCertification1.html

@@ -488,6 +488,9 @@
     }
 </style>
 <link rel="stylesheet" href="https://cdn.bootcss.com/jquery-datetimepicker/2.5.4/jquery.datetimepicker.css">
+<!-- loading start -->
+<div class="loading in" ng-class="{'in': loading}"><i></i></div>
+<!-- loading end -->
 <!--主体内容-->
 <div class="content-wrapper" style="min-height: 924px;; z-index: 50;">
     <!-- Main content -->

donate-console/src/main/webapp/resources/view/user/charityCertification2.html

@@ -484,6 +484,9 @@
     }
 </style>
 
+<!-- loading start -->
+<div class="loading in" ng-class="{'in': loading}"><i></i></div>
+<!-- loading end -->
 <!--主体内容-->
 <div class="content-wrapper" style="min-height: 924px;; z-index: 50;">
     <!-- Main content -->

donate-console/src/main/webapp/resources/view/user/charityCertification3.html

@@ -591,6 +591,9 @@
 
 </style>
 
+<!-- loading start -->
+<div class="loading in" ng-class="{'in': loading}"><i></i></div>
+<!-- loading end -->
 <!--主体内容-->
 <div class="content-wrapper" style="min-height: 924px;; z-index: 50;">
     <!-- Main content -->

donate-console/src/main/webapp/resources/view/user/publicOfferingCertification.html

@@ -500,6 +500,9 @@
     }
 </style>
 
+<!-- loading start -->
+<div class="loading in" ng-class="{'in': loading}"><i></i></div>
+<!-- loading end -->
 <!--主体内容-->
 <div class="content-wrapper" style="min-height: 924px;; z-index: 50;">
     <!-- Main content -->

donate-console/src/main/webapp/resources/view/user/publicOfferingCertification1.html

@@ -522,6 +522,9 @@
     }
 </style>
 
+<!-- loading start -->
+<div class="loading in" ng-class="{'in': loading}"><i></i></div>
+<!-- loading end -->
 <!--主体内容-->
 <div class="content-wrapper" style="min-height: 924px;; z-index: 50;">
     <!-- Main content -->

donate-console/src/main/webapp/resources/view/user/publicOfferingCertification2.html

@@ -519,6 +519,9 @@
     }
 </style>
 
+<!-- loading start -->
+<div class="loading in" ng-class="{'in': loading}"><i></i></div>
+<!-- loading end -->
 <!--主体内容-->
 <div class="content-wrapper" style="min-height: 924px;; z-index: 50;">
     <!-- Main content -->

donate-console/src/main/webapp/resources/view/user/publicOfferingCertification3.html

@@ -606,6 +606,9 @@
     }
 </style>
 
+<!-- loading start -->
+<div class="loading in" ng-class="{'in': loading}"><i></i></div>
+<!-- loading end -->
 <!--主体内容-->
 <div class="content-wrapper" style="min-height: 924px;; z-index: 50;">
     <!-- Main content -->

donate-console/src/main/webapp/resources/view/user/publicOfferingCertification4.html

@@ -625,6 +625,9 @@
     }
 </style>
 
+<!-- loading start -->
+<div class="loading in" ng-class="{'in': loading}"><i></i></div>
+<!-- loading end -->
 <!--主体内容-->
 <div class="content-wrapper" style="min-height: 924px;; z-index: 50;">
     <!-- Main content -->

donate-console/src/main/webapp/resources/view/user/selectInstitutionsNature.html

@@ -89,6 +89,9 @@
         }
     </style>
 
+<!-- loading start -->
+<div class="loading in" ng-class="{'in': loading}"><i></i></div>
+<!-- loading end -->
 <!--主体内容-->
 <div class="content-wrapper" style="min-height: 924px;; z-index: 50;">
     <!-- Main content -->