项目发起添加loading状态防止多次点击。活动相关项目数错误修改。

donate-console/src/main/java/com/uas/console/donate/service/impl/ActivityServiceImpl.java

@@ -84,7 +84,7 @@ public class ActivityServiceImpl implements ActivityService{
         // 如果是已保存的
         if (null != activity.getId()) {
             Activity oldActivity = activityDao.findOne(activity.getId());
-            oldActivity.setSumconnect(activity.getProjects().size());
+            activity.setSumconnect(activity.getProjects().size());
             Date date=new Date();
             //设置活动发布时间
             activity.setSubmitTime(date);

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

@@ -1367,6 +1367,7 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'file-
      */
     app.controller('ProjectNewCtrl', ['$scope', 'BaseService', 'Project', '$http', 'toaster', '$stateParams', '$rootScope',
         function($scope, BaseService, Project, $http, toaster, $stateParams, $rootScope) {
+        $scope.loading = true;
         BaseService.scrollBackToTop();
         $rootScope.tree = 'project';
         $rootScope.thief = 'new';
@@ -1396,6 +1397,7 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'file-
             });
 
             Project.getSavedProject({}, {}, function(data) {
+                $scope.loading = false;
                 if(angular.isObject(data)) {
                     $scope.project = data;
                     $scope.pcImgUrl = data.pcImg;
@@ -1407,6 +1409,7 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'file-
 
             if (!angular.isUndefined($stateParams.id)) {
               Project.getDetailById({id : $stateParams.id}, {}, function(data) {
+                  $scope.loading = false;
                   $scope.project = data;
                   $scope.pcImgUrl = data.pcImg;
                   $scope.mobileImgUrl = data.mobileImg;
@@ -1463,20 +1466,22 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'file-
                 BaseService.scrollBackToTop();
                 return;
             }
-            if (project.startTime == project.endTime) {
-               toaster.pop('info', '项目开始时间与结束时间不能相同，请修改之后再保存');
-            } else {
-                Project.saveBaseInfo({}, project, function(data) {
-                    $scope.project = data;
-                    var proId = $scope.project.id;
-                    if(proId) {
-                        BaseService.scrollBackToTop();
-                        window.location.href = '#/launchProject/detail/' + proId;
-                    }
-                },function(res) {
-                    toaster.pop('error', '出现错误，操作失败');
-                });
-            }
+            // if (project.startTime == project.endTime) {
+            //    toaster.pop('info', '项目开始时间与结束时间不能相同，请修改之后再保存');
+            // } else {
+            $scope.loading = true;
+            Project.saveBaseInfo({}, project, function(data) {
+                $scope.project = data;
+                var proId = $scope.project.id;
+                if(proId) {
+                    $scope.loading = false;
+                    BaseService.scrollBackToTop();
+                    window.location.href = '#/launchProject/detail/' + proId;
+                }
+            },function(res) {
+                toaster.pop('error', '出现错误，操作失败');
+            });
+            // }
         };
 
         // 删除
@@ -1612,7 +1617,7 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'file-
                 BaseService.scrollBackToTop();
                 return;
             }
-
+            $scope.loading = true;
             var data = new FormData();      //以下为像后台提交图片数据
             data.append('pcImg', $scope.pcImg);
             data.append('mobileImg', $scope.mobileImg);
@@ -1637,6 +1642,7 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'file-
                 url : url,
                 data: data
             }).success(function (data) {
+                $scope.loading = false;
                 if (type) {
                     toaster.pop('success', '发布成功');
                     $rootScope.active = 'unaudited';

donate-console/src/main/webapp/resources/view/project/project_launch_1.html

@@ -804,6 +804,9 @@
         background: #626262;
     }
 </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 -->
     <section class="content">
@@ -851,7 +854,7 @@
 
                                         <span class="error" ng-show="submited && project.startTime == null">*请选择活动开始时间</span>
                                         <span class="error" ng-show="submited && project.endTime == null">*请选择活动结束时间</span>
-                                        <span class="error" ng-show="submited && project.startTime != null && project.endTime != null && project.startTime.getTime() == project.endTime.getTime()">*项目开始时间与结束时间不能相同</span>
+                                        <span class="error" ng-show="submited && project.startTime != null && project.endTime != null && project.startTime == project.endTime">*项目开始时间与结束时间不能相同</span>
                                     </div>
                                 </div>
                                 <div class="form-group clearfix">

donate-console/src/main/webapp/resources/view/project/project_launch_2.html

@@ -562,6 +562,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 -->
     <section class="content">

donate-service/src/main/webapp/resources/view/activity/activity_detail.html

@@ -605,9 +605,9 @@
                             <!--<span ng-if="award.awardLevel == 2">二等奖：</span>-->
                             <!--<span ng-if="award.awardLevel == 3">三等奖：</span>-->
                             <!--<span ng-if="award.awardLevel != 1 && award.awardLevel != 2 && award.awardLevel != 3">参与奖：</span>-->
-                            <span>奖品名称：{{award.awardName}}</span>
-                            <span>奖品等级：{{award.awardLevel}}</span>
-                            <span>奖品简介：{{award.awardSummary}}</span>
+                            <span><strong>奖品名称</strong>：{{award.awardName}}</span>
+                            <span style="padding-left: 20px;"><strong>奖品等级</strong>：{{award.awardLevel}}</span>
+                            <span style="padding-left: 20px;"><strong>奖品简介</strong>：{{award.awardSummary}}</span>
                         </p>
                     </div>
                 </div>
@@ -639,10 +639,10 @@
                     <p class="title">活动项目</p>
                     <div class="item-list clearfix" ng-repeat="project in activity.projects">
                         <div class="img fl">
-                            <a href="/project#/detail/{{project.proId}}"><img src="{{project.pcImg}}" alt="项目缩略图" title="{{project.name}}"></a>
+                            <a href="/project#/detail/{{project.id}}"><img src="{{project.pcImg}}" alt="项目缩略图" title="{{project.name}}"></a>
                         </div>
                         <div class="txt fl">
-                            <p><a href="/project#/detail/{{project.proId}}">{{project.name}}</a></p>
+                            <p><a href="/project#/detail/{{project.id}}">{{project.name}}</a></p>
                             <span>{{project.projectSummary}}</span>
                         </div>
                     </div>