时间显示格式修改。活动发起完整性验证提示修改。

donate-console/src/main/webapp/resources/view/activity/activity_launch.html

@@ -680,7 +680,7 @@
 
                             <span class="error" ng-show="submited && !activity.startTime">*请选择活动开始时间</span>
                             <span class="error" ng-show="submited && !activity.endTime">*请选择活动结束时间</span>
-                            <span class="error" ng-show="submited && activity.startTime && activity.endTime && activity.startTime.getTime() == activity.endTime.getTime()">*活动开始时间与结束时间不能相同</span>
+                            <span class="error" ng-show="submited && activity.startTime && activity.endTime && activity.startTime == activity.endTime">*活动开始时间与结束时间不能相同</span>
                         </div>
                     </div>
                     <div class="form-group clearfix">
@@ -706,7 +706,7 @@
 
                             <span class="error" ng-show="submited && !activity.receiveStartTime">*请选择开始兑奖时间</span>
                             <span class="error" ng-show="submited && !activity.receiveEndTime">*请选择截止兑奖时间</span>
-                            <span class="error" ng-show="submited && activity.receiveStartTime && activity.receiveEndTime && activity.receiveStartTime.getTime() == activity.receiveEndTime.getTime()">*兑奖开始时间与截止时间不能相同</span>
+                            <span class="error" ng-show="submited && activity.receiveStartTime && activity.receiveEndTime && activity.receiveStartTime == activity.receiveEndTime">*兑奖开始时间与截止时间不能相同</span>
                         </div>
                     </div>
                     <div class="form-group clearfix">
@@ -774,7 +774,7 @@
                                     <span class="error" ng-show="submited && activityForm.awardAmount.$error.pattern">*活动奖品的数量不正确</span>
                                 </div>
                                 <div class="award-detail clearfix">
-                                    <span class="fl">奖品{{award.awardLevel}}等级</span>
+                                    <span class="fl">奖品等级</span>
                                     <input type="text" ng-model="award.awardLevel" maxlength="10" class="fl form-control" required
                                                        ng-class="{'showEmpty' : submited && !award.awardLevel}"/>
 
@@ -790,7 +790,7 @@
                                 </div>
                                 <div class="uploadImg">
                                     上传图片
-                                    <input type="file" ng-multiple="false" accept="image/*" id="award{{$index}}" ng-model="award.prizeImgs" ng-file-select ng-change="uploadPrizeImg(award, $index)">
+                                    <input type="file" ng-multiple="false" accept="image/*" id="award{{$index}}" ng-model="award.prizeImgs" ng-file-select ng-change="uploadPrizeImg(award, $index)" ng-required="!award.img">
                                 </div>
                                 <div ng-if="null != award.img" class="showImage">
                                     <img  src="{{award.img}}">
@@ -800,7 +800,7 @@
                                     </span>
                                 </div>
 
-                                <span class="error" ng-show="submited && !award.img">*请上传活动奖品图片</span>
+                                <span class="error" ng-show="submited && !award.img && !award.prizeImgs">*请上传活动奖品图片</span>
                             </div>
                             <div class="add-price">
                                 <a ng-click="addAward()">+添加奖品</a>
@@ -821,7 +821,8 @@
                                 <span>+选择项目</span>
                             </div>
                             <div class="button">
-                                <button ng-click="submit(true, activityForm.$invalid || !activity.summary || !actImgUrl || !bannerUrl)" class="launch">发布</button>
+                                <button ng-click="submit(true, activityForm.$invalid || !activity.summary || !actImgUrl ||
+                                !bannerUrl || !awards || !selectedProjects)" class="launch">发布</button>
                                 <button ng-click="submit(false)" ng-disabled="!activityForm.$dirty" class="draft">存为草稿</button>
                                 <span style="color: #5078cb;" class="clear" ng-click="clearActivity()">清空内容</span>
                             </div>

donate-console/src/main/webapp/resources/view/activity/activity_list.html

@@ -837,18 +837,18 @@
                             <td></td>
                             <td>
                                 <div class="name clearfix">
-                                    <p class="fl" ng-click="showDetail(activity.id)">{{activity.name}}</p>
+                                    <p class="fl" ng-click="showDetail(activity.id)" title="查看详情">{{activity.name}}</p>
                                     <div class="fl" ng-if="active == 'done'"><a ng-click="openAward(activity.id)" class="open-award">开奖</a></div>
                                 </div>
                             </td>
-                            <td>{{activity.sumconnect}}</td>
-                            <td>{{activity.startTime | date :'yyyy-MM-dd HH:mm:ss'}}</td>
-                            <td>{{activity.luckyTime | date :'yyyy-MM-dd HH:mm:ss'}}</td>
-                            <td ng-if="active == 'end'">{{activity.endTime | date :'yyyy-MM-dd HH:mm:ss'}}</td>
-                            <td>{{activity.joinedPerson | number}}人</td>
-                            <td ng-if="active == 'end'">{{activity.luckyPerson | number}}人</td>
-                            <td ng-if="active == 'end'">{{activity.receivePerson | number}}人</td>
-                            <td ng-if="active != 'waiting'">{{activity.amount | number}}元</td>
+                            <td>{{activity.sumconnect || 0}}</td>
+                            <td>{{activity.startTime || '无' | date :'yyyy-MM-dd'}}</td>
+                            <td>{{activity.luckyTime || '无' | date :'yyyy-MM-dd'}}</td>
+                            <td ng-if="active == 'end'">{{activity.endTime || '无' | date :'yyyy-MM-dd'}}</td>
+                            <td>{{activity.joinedPerson || 0 | number}}人</td>
+                            <td ng-if="active == 'end'">{{activity.luckyPerson || 0 | number}}人</td>
+                            <td ng-if="active == 'end'">{{activity.receivePerson || 0 | number}}人</td>
+                            <td ng-if="active != 'waiting'">{{activity.amount || 0 | number:2}}元</td>
                             <td>{{activity.person}}</td>
                             <td></td>
                         </tr>

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

@@ -807,7 +807,7 @@
                                         <!--<div><span>编辑</span></div>-->
                                     </div>
                                 </td>
-                                <td>{{project.submitTime | date:'yyyy-MM-dd HH:mm:ss'}}</td>
+                                <td>{{project.submitTime | date:'yyyy-MM-dd'}}</td>
                                 <td>{{project.orgName}}</td>
                                 <td>{{project.target}}元</td>
                                 <td>{{project.amount}}元 <br/>({{project.amount * 100 / project.target}}%)</td>

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

@@ -823,8 +823,8 @@
                                     </div>
                                 </td>
                                 <td>{{project.area}}</td>
-                                <td>{{project.submitTime | date:'yyyy-MM-dd HH:mm:ss'}}</td>
-                                <td>{{project.modifyTime | date:'yyyy-MM-dd HH:mm:ss'}}</td>
+                                <td>{{project.submitTime | date:'yyyy-MM-dd'}}</td>
+                                <td>{{project.modifyTime | date:'yyyy-MM-dd'}}</td>
                                 <td>{{project.orgName}}</td>
                                 <td>{{project.totalCost / project.totalAmount * 100 || 87.6}}%</td>
                                 <td></td>

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

@@ -579,7 +579,7 @@
                             </td>
                             <td>{{org.fullTimePopulation + org.partTimePopulation + org.voluntaryPopulation | number}}人</td>
                             <td ng-if="active == 'unaudited'">
-                                {{org.submitTime | date : 'yyyy-MM-dd HH:mm:ss'}}
+                                {{org.submitTime | date : 'yyyy-MM-dd'}}
                             </td>
                             <td ng-if="active == 'unaudited'"></td>
                             <td ng-if="active != 'unaudited'"></td>