活动发起页表单验证提示信息调整

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

@@ -616,7 +616,7 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'file-
      */
     app.controller('CertificationStep0Ctrl', ['$scope', 'toaster', 'Organization', '$location',
         function ($scope, toaster, Organization, $location) {
-            $scope.checked = false;
+            $scope.checked = true;
             $scope.changeChecked = function() {
                 $scope.checked = !$scope.checked;
             };
@@ -687,7 +687,11 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'file-
 
 
             //提交
-            $scope.saveStep1 = function (org, orgType) {
+            $scope.saveStep1 = function (org, orgType, invalid) {
+                if (invalid == true) {
+                    $scope.submited = true;
+                    return;
+                }
                 if (orgCopy == org) {
                     if (orgType == 1) {
                         $location.path('publicOfferingCertificationStep2');
@@ -2404,7 +2408,12 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'file-
         };
 
         // 保存 或 提交
-        $scope.submit = function(type) {
+        $scope.submit = function(type, invalid) {
+            if (invalid == true) {
+                $scope.submited = true;
+                BaseService.scrollBackToTop();
+                return;
+            }
             var projectList = [];
             angular.forEach($scope.selectedProjects, function(project) {
                 projectList.push(project);

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

@@ -618,11 +618,13 @@
     <!-- Main content -->
     <section class="content">
         <div class="box-show">
-            <form class="form-horizontal" name="activityForm">
+            <form class="form-horizontal" name="activityForm" novalidate>
                 <div class="content-setting">
                     <div class="form-group clearfix">
                         <label class="control-label fl">活动标题</label>
-                        <input type="text" class="form-control fl" ng-model="activity.name" required/>
+                        <input type="text" class="form-control fl" name="activityName" ng-model="activity.name" required/>
+
+                        <span class="error" ng-show="submited && activityForm.activityName.$error.required">*活动标题不能为空</span>
                     </div>
                     <div class="form-group clearfix">
                         <label class="control-label fl">活动时间</label>
@@ -642,6 +644,9 @@
                                    current-text="今天" clear-text="清除" close-text="关闭"
                                    datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
                                    ng-click="openDatePicker($event, activity, '$endTimeOpened')">
+
+                            <span class="error" ng-show="submited && activity.startTime == null">*请选择活动开始时间</span>
+                            <span class="error" ng-show="submited && activity.endTime == null">*请选择活动结束时间</span>
                         </div>
                     </div>
                     <div class="form-group clearfix">
@@ -662,6 +667,9 @@
                                    current-text="今天" clear-text="清除" close-text="关闭"
                                    datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
                                    ng-click="openDatePicker($event, activity, '$receiveEndTimeOpened')">
+
+                            <span class="error" ng-show="submited && activity.receiveStartTime == null">*请选择开始兑奖时间</span>
+                            <span class="error" ng-show="submited && activity.receiveEndTime == null">*请选择截止兑奖时间</span>
                         </div>
                     </div>
                     <div class="form-group clearfix">
@@ -670,6 +678,8 @@
                             <summernote lang="zh-CN" ng-model="activity.summary" height="300px">
                             </summernote>
                         </div>
+
+                        <span class="error" ng-show="submited && activity.summary == null">*请填写活动介绍</span>
                     </div>
                     <div class="form-group clearfix">
                         <label class="control-label fl">封面图片</label>
@@ -684,6 +694,8 @@
                                 </span>
                             </div>
                         </div>
+
+                        <span class="error" ng-show="submited && actImgUrl == null">*请上传封面图片</span>
                     </div>
                     <div class="form-group clearfix">
                         <label class="control-label fl">Banner</label>
@@ -698,6 +710,8 @@
                                 </span>
                             </div>
                         </div>
+
+                        <span class="error" ng-show="submited && bannerUrl == null">*请上传Banner</span>
                     </div>
                     <div class="form-group clearfix">
                         <label class="control-label fl">活动奖品</label>
@@ -711,10 +725,14 @@
                                 <div class="award-detail clearfix">
                                     <span class="fl">数量</span>
                                     <input type="text" ng-model="award.amount" class="fl form-control" required>
+
+                                    <span class="error" ng-show="submited && award.amount == null">*活动奖品的数量不能为空</span>
                                 </div>
                                 <div class="award-detail clearfix">
                                     <span class="fl">奖品等级</span>
                                     <input type="text" ng-model="award.awardLevel" class="fl form-control" required>
+
+                                    <span class="error" ng-show="submited && award.awardLevel == null">*活动奖品的奖品等级不能为空</span>
                                 </div>
                                 <div class="award-detail clearfix">
                                     <span class="fl">赠送方式</span>
@@ -735,11 +753,15 @@
                                         <a ng-click="showImg(award.img)" title="点击查看大图"><em class="fa fa-search"></em> 查看</a>
                                     </span>
                                 </div>
+
+                                <span class="error" ng-show="submited && award.img == null">*请上传活动奖品图片</span>
                             </div>
                             <div class="add-price">
                                 <a ng-click="addAward()">+添加奖品</a>
                             </div>
                         </div>
+
+                        <span class="error" ng-show="submited && awards.length == null">*请添加活动奖品</span>
                     </div>
                     <div class="form-group clearfix" style="height:auto;">
                         <label class="control-label fl">活动项目</label>
@@ -753,11 +775,12 @@
                                 <span>+选择项目</span>
                             </div>
                             <div class="button">
-                                <button ng-click="submit(true)" ng-disabled="activityForm.$invalid || !activity.summary || !actImgUrl || !bannerUrl" class="launch">发布</button>
+                                <button ng-click="submit(true, activityForm.$invalid || !activity.summary || !actImgUrl || !bannerUrl)" class="launch">发布</button>
                                 <button ng-click="submit(false)" class="draft">存为草稿</button>
                                 <span class="clear" ng-click="clearActivity()">清空内容</span>
                             </div>
                         </div>
+                        <span class="error" ng-show="submited && selectedProjects.length == null">*请添加活动项目</span>
                     </div>
                 </div>
             </form>

donate-service/src/main/webapp/resources/js/pay.js

@@ -20,7 +20,7 @@ var pay =function (proId, amount, payWay, imid) {
             if (0 < parseFloat(customAmount) && parseFloat(customAmount) < 10000000) {
                 amount = customAmount;
             } else {
-                toastr.warning("您输入的金额超出限制，请在0.01~9999999.99之间");
+                toastr.warning("请输入正确的数！");
                 return;
             }
         } else {