Merge remote-tracking branch 'origin/dev' into dev

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

@@ -803,6 +803,18 @@
         height: 16px;
         background: #626262;
     }
+    .showEmpty{
+        border: 1px dashed red;
+    }
+    .form .form-group input[type='text']:focus {
+        border: 1px solid #66afe9 !important ;
+        outline: 0;
+        -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102,175,233,.6);
+        box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102,175,233,.6);
+    }
+    .form .form-group span.error{
+        color: red;
+    }
 </style>
 <!-- loading start -->
 <div class="loading in" ng-class="{'in': loading}"><i></i></div>
@@ -827,7 +839,8 @@
                             <form action="" class="form" name="baseInfoForm">
                                 <div class="form-group clearfix">
                                     <label for="" class="fl">项目名称</label>
-                                    <input type="text" ng-model="project.name" class="form-control fl" name="projectName" ng-maxlength="9" required>
+                                    <input type="text" ng-model="project.name" class="form-control fl" name="projectName" ng-maxlength="9" required
+                                                       ng-class="{'showEmpty': submited && baseInfoForm.projectName.$error.required ||submited && baseInfoForm.projectName.$error.maxlength}">
                                     <span class="fl help-txt">（不超过9个字）</span>
 
                                     <span class="error" ng-show="submited && baseInfoForm.projectName.$error.required">*项目名称不能为空</span>
@@ -842,7 +855,8 @@
                                                ng-required="true" max-date="project.endTime"
                                                current-text="今天" clear-text="清除" close-text="关闭"
                                                datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-                                               ng-click="openDatePicker($event, project, '$startTimeOpened')">
+                                               ng-click="openDatePicker($event, project, '$startTimeOpened')"
+                                               ng-class="{'showEmpty': submited && project.startTime == null}"/>
                                         <span class="fl" style="margin-left: 10px;margin-right: 10px;">至</span>
                                         <input type="text" ng-model="project.endTime" readonly required
                                                class="date-choose f1 form-control" placeholder="结束时间"
@@ -850,7 +864,8 @@
                                                ng-required="true"
                                                current-text="今天" clear-text="清除" close-text="关闭"
                                                datepicker-options="{formatDayTitle: 'yyyy年M月', formatMonth: 'M月', showWeeks: false}"
-                                               ng-click="openDatePicker($event, project, '$endTimeOpened')">
+                                               ng-click="openDatePicker($event, project, '$endTimeOpened')"
+                                               ng-class="{'showEmpty': submited && project.endTime == null}"/>
 
                                         <span class="error" ng-show="submited && project.startTime == null">*请选择活动开始时间</span>
                                         <span class="error" ng-show="submited && project.endTime == null">*请选择活动结束时间</span>
@@ -911,7 +926,8 @@
 
                                 <div class="form-group clearfix">
                                     <label for="" class="fl">筹款目标</label>
-                                    <input type="text" ng-model="project.target" class="form-control fl" name="projectTarget" ng-pattern="/^[1-9]\d{0,8}$/" required>
+                                    <input type="text" ng-model="project.target" class="form-control fl" name="projectTarget" ng-pattern="/^[1-9]\d{0,8}$/" required
+                                    ng-class="{'showEmpty': submited && baseInfoForm.projectTarget.$error.required || submited && baseInfoForm.projectTarget.$error.pattern}"/>
                                     <span class="fl help-txt">（请输入整数金额，例如：5000）</span>
 
                                     <span class="error" ng-show="submited && baseInfoForm.projectTarget.$error.required">*筹款目标金额不能为空</span>
@@ -928,7 +944,8 @@
                                 </div>
                                 <div class="form-group clearfix">
                                     <label for="" class="fl">发起缘由</label>
-                                    <textarea style="max-height: 200px; max-width: 600px;" ng-model="project.reason" ng-maxlength="54" name="projectReason" id="" cols="30" rows="10" class="fl" required></textarea>
+                                    <textarea style="max-height: 200px; max-width: 600px;" ng-model="project.reason" ng-maxlength="54" name="projectReason" id="" cols="30" rows="10" class="fl" required
+                                    ng-class="{'showEmpty': submited && baseInfoForm.projectReason.$error.required || submited && baseInfoForm.projectReason.$error.maxlength}"></textarea>
                                     <span class="txt">提示文字：请您填写真实的身份信息，与受助对象的关系，以及该项目的简要介绍，54字以内。</span>
 
                                     <span class="error" ng-show="submited && baseInfoForm.projectReason.$error.required">*发起缘由不能为空</span>

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

@@ -260,7 +260,13 @@
         font-size: 12px;
         color: #969696;
     }
+    .detail .list-item div.fl .computer span.error{
+        width: 115px;
+        font-size: 12px;
+        color: red;
+    }
     .detail .list-item div.fl .showImg{
+        position: relative ;
         margin: 16px 0 0 120px;
         width: 180px;
         height: 180px;
@@ -561,6 +567,20 @@
         font-size: 16px;
         color: #1968f9;
     }
+    .showEmpty{
+        border: 1px dashed red;
+    }
+    .detail .list-item div.fl .item span.error{
+        font-size: 12px;
+        color: #f00;
+    }
+    .detail .list-item div.fl .item span.marginL100{
+        margin-left: 100px;
+    }
+    .detail .list-item .simple span.error{
+        font-size: 12px;
+        color: #f00;
+    }
 </style>
 <!-- loading start -->
 <div class="loading in" ng-class="{'in': loading}"><i></i></div>
@@ -587,7 +607,8 @@
                                     <div class="computer">
                                         <span>PC端主图</span>
                                         <button type="button">上传图片</button>
-                                        <input type="file" ng-multiple="false" id="pcImg" accept="image/*" onchange='angular.element(this).scope().fileChanged(this, 0)'>
+                                        <input type="file" ng-multiple="false" id="pcImg" accept="image/*" onchange='angular.element(this).scope().fileChanged(this, 0)'
+                                                           ng-class="{'showEmpty': submited && pcImgUrl == null && project.pcImg == null}"/>
                                         <em>(最能代表项目的焦点图，图片尺寸不小于500*280px,支持jpg,gif,png格式，不超过10MB)</em>
                                         <div ng-if="null != pcImgUrl" class="showImg">
                                             <img src="{{pcImgUrl}}">
@@ -597,12 +618,13 @@
                                             </span>
                                         </div>
 
-                                        <span class="error" ng-show="submited && pcImgUrl == null && project.pcImg == null">*请上传PC端主图</span>
+                                        <span class="error" ng-show="submited && mobileImgUrl == null && project.mobileImg == null">*请上传PC端主图</span>
                                     </div>
                                     <div class="computer">
                                         <span>手机端主图</span>
                                         <button>上传图片</button>
-                                        <input type="file" ng-multiple="false" id="mobileImg" accept="image/*" onchange='angular.element(this).scope().fileChanged(this, 1)'>
+                                        <input type="file" ng-multiple="false" id="mobileImg" accept="image/*" onchange='angular.element(this).scope().fileChanged(this, 1)'
+                                                           ng-class="{'showEmpty': submited && pcImgUrl == null && project.pcImg == null}"/>
                                         <em>(最能代表项目的焦点图，图片尺寸不小于500*280px,支持jpg,gif,png格式，不超过10MB)</em>
                                         <div ng-if="null != mobileImgUrl" class="showImg">
                                             <img src="{{mobileImgUrl}}">
@@ -621,7 +643,8 @@
                                 <div class="fl">
                                     <div class="computer uploadImg">
                                         <button>上传图片</button>
-                                        <input type="file" ng-multiple="false" id="mobileListImg" accept="image/*" onchange='angular.element(this).scope().fileChanged(this, 2)'>
+                                        <input type="file" ng-multiple="false" id="mobileListImg" accept="image/*" onchange='angular.element(this).scope().fileChanged(this, 2)'
+                                                           ng-class="{'showEmpty': submited && mobileListImgUrl == null && project.mobileListImg == null}"/>
                                         <em>(最能代表项目的焦点图，图片尺寸不小于500*375像素以上,支持jpg,gif,png格式，不超过10MB)</em>
                                         <div ng-if="null != mobileListImgUrl" class="showImg" style="margin-left: -15px;">
                                             <img src="{{mobileListImgUrl}}">
@@ -641,7 +664,8 @@
                                     <span class="intro"></span>
                                     <div class="item clearfix">
                                         <span class="fl">姓名</span>
-                                        <input type="text" class="form-control fl" name="projectPersonName" ng-maxlength="20" ng-model="project.personName" placeholder="不超过二十个字" required>
+                                        <input type="text" class="form-control fl" name="projectPersonName" ng-maxlength="20" ng-model="project.personName" placeholder="不超过二十个字" required
+                                        ng-class="{'showEmpty': submited && detailForm.projectPersonName.$error.required || submited && detailForm.projectPersonName.$error.maxlength}"/>
 
                                         <span class="error" ng-show="submited && detailForm.projectPersonName.$error.required">*姓名不能为空</span>
                                         <span class="error" ng-show="submited && detailForm.projectPersonName.$error.maxlength">*姓名字数过长</span>
@@ -650,7 +674,8 @@
                                         <span class="fl">头像</span>
                                         <div class="button fl">
                                             <button>上传图片</button>
-                                            <input type="file" ng-multiple="false" id="logo" accept="image/*" onchange='angular.element(this).scope().fileChanged(this, 3)'>
+                                            <input type="file" ng-multiple="false" id="logo" accept="image/*" onchange='angular.element(this).scope().fileChanged(this, 3)'
+                                                               ng-class="{'showEmpty': submited && logoUrl == null && project.logo == null}"/>
                                             <em>（图片尺寸不小于500*500px,不超过2MB）</em>
                                             <div ng-if="null != logoUrl" class="showImg" style="margin-left: 40px;">
                                                 <img src="{{logoUrl}}">
@@ -665,41 +690,45 @@
                                     </div>
                                     <div class="item clearfix">
                                         <span class="fl">工作单位</span>
-                                        <input type="text" class="form-control fl" name="projectWorkunit" ng-model="project.workunit" ng-maxlength="20" placeholder="不超过二十个字" required/>
+                                        <input type="text" class="form-control fl" name="projectWorkunit" ng-model="project.workunit" ng-maxlength="20" placeholder="不超过二十个字" required
+                                                                                                           ng-class="{'showEmpty': submited && detailForm.projectWorkunit.$error.required || submited && detailForm.projectWorkunit.$error.maxlength}"/>
 
                                         <span class="error" ng-show="submited && detailForm.projectWorkunit.$error.required">*工作单位不能为空</span>
                                         <span class="error" ng-show="submited && detailForm.projectWorkunit.$error.maxlength">*工作单位字数过长</span>
                                     </div>
                                     <div class="item clearfix">
                                         <span class="fl">联系电话</span>
-                                        <input type="text" class="form-control fl" name="projectPersonTel" ng-model="project.personTel" ng-maxlength="20" placeholder="填写联系电话" required/>
+                                        <input type="text" class="form-control fl" name="projectPersonTel" ng-model="project.personTel" ng-maxlength="20" placeholder="填写联系电话" required
+                                                                                                           ng-class="{'showEmpty': submited && detailForm.projectPersonTel.$error.required || submited && detailForm.projectPersonTel.$error.maxlength}"/>
 
                                         <span class="error" ng-show="submited && detailForm.projectPersonTel.$error.required">*联系电话不能为空</span>
                                         <span class="error" ng-show="submited && detailForm.projectPersonTel.$error.maxlength">*联系电话过长</span>
                                     </div>
                                     <div class="item clearfix">
                                         <span class="fl">个人简介</span>
-                                        <textarea name="projectSummary" id="" cols="30" rows="10" ng-model="project.summary" ng-maxlength="60" placeholder="不超过六十个字" required></textarea>
-
-                                        <span class="error" ng-show="submited && detailForm.projectSummary.$error.required">*个人简介不能为空</span>
-                                        <span class="error" ng-show="submited && detailForm.projectSummary.$error.maxlength">*个人简介过长</span>
+                                        <textarea name="projectSummary" id="" cols="30" rows="10" ng-model="project.summary" ng-maxlength="60" placeholder="不超过六十个字" required
+                                                                                                  ng-class="{'showEmpty': submited && detailForm.projectSummary.$error.required || submited && detailForm.projectSummary.$error.maxlength}"></textarea>
+                                        <br/>
+                                        <span class="error marginL100" ng-show="submited && detailForm.projectSummary.$error.required">*个人简介不能为空</span>
+                                        <span class="error marginL100" ng-show="submited && detailForm.projectSummary.$error.maxlength">*个人简介过长</span>
                                     </div>
                                 </div>
                             </div>
                             <div class="list-item clearfix">
                                 <span class="fl">项目简介</span>
                                 <div class="fl simple">
-                                    <textarea name="projectProSummary" cols="30" rows="10" ng-model="project.proSummary" ng-maxlength="27" placeholder="目的简单介绍，不超过27个字" required></textarea>
-
+                                    <textarea name="projectProSummary" cols="30" rows="10" ng-model="project.proSummary" ng-maxlength="27" placeholder="目的简单介绍，不超过27个字" required
+                                                                                           ng-class="{'showEmpty': submited && detailForm.projectProSummary.$error.required || submited && detailForm.projectProSummary.$error.maxlength}"></textarea>
+                                    <br/>
                                     <span class="error" ng-show="submited && detailForm.projectProSummary.$error.required">*项目简介不能为空</span>
                                     <span class="error" ng-show="submited && detailForm.projectProSummary.$error.maxlength">*项目简介过长</span>
-                                    <br/>
                                 </div>
                             </div>
                             <div class="list-item clearfix">
                                 <span class="fl">项目介绍</span>
                                 <div class="fl simple">
-                                    <summernote lang="zh-CN" ng-model="project.introduction" height="300px">
+                                    <summernote lang="zh-CN" ng-model="project.introduction" height="300px"
+                                                             ng-class="{'showEmpty': submited && project.introduction == null}">
                                         请填写介绍
                                     </summernote>