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

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

@@ -36,6 +36,8 @@ public class ProjectRecodeServiceImpl implements ProjectRecodeService {
         return projectRecodeDao.findAll(new Specification<ProjectRecode>() {
             @Override
             public Predicate toPredicate(Root<ProjectRecode> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
+                // 支付已完成
+                pageInfo.expression(PredicateUtils.eq("status", 2, false));
                 if (null != proId) {
                     pageInfo.expression(PredicateUtils.eq("proId", proId, false));
                 }

donate-console/src/main/webapp/resources/css/base.css

@@ -304,4 +304,14 @@ textarea {
 	font-size: 16px;
 	color: #ef613b;
 	border: 1px solid #dcdcdc;
+}
+
+/* datepicker 今天按钮隐藏，清除按钮样式修改 */
+div.active-time ul.dropdown-menu span.btn-group.pull-left>button.btn:first-child{
+	display: none;
+}
+
+div.active-time ul.dropdown-menu span.btn-group.pull-left>button.btn:nth-child(2){
+	border-bottom-left-radius: 3px;
+	border-top-left-radius: 3px;
 }

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

@@ -1376,9 +1376,9 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'file-
                 BaseService.scrollBackToTop();
                 return;
             }
-            // if (project.startTime == project.endTime) {
-            //    toaster.pop('info', '项目开始时间与结束时间不能相同，请修改之后再保存');
-            // } else {
+            if (project.startTime == project.endTime) {
+               toaster.pop('info', '项目开始时间与结束时间不能相同，请修改之后再保存');
+            } else {
                 Project.saveBaseInfo({}, project, function(data) {
                     $scope.project = data;
                     var proId = $scope.project.id;
@@ -1389,7 +1389,7 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'file-
                 },function(res) {
                     toaster.pop('error', '出现错误，操作失败');
                 });
-            // }
+            }
         };
 
         // 删除

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

@@ -48,7 +48,7 @@
                 </div>
                 <div class="msg-list fl">
                     <span class="fl">项目地点</span>
-                    <span class="fl">{{project.province}}省 {{project.city}}市</span>
+                    <span class="fl">{{project.province}}&nbsp;{{project.city}}</span>
                 </div>
                 <div class="msg-list fl">
                     <span class="fl">受助群体</span>
@@ -181,7 +181,7 @@
                 </div>
                 <div class="msg-list fl">
                     <span class="fl">所在地</span>
-                    <span class="fl">{{project.organization.province}}省 {{project.organization.city}}市</span>
+                    <span class="fl">{{project.organization.province}}&nbsp;{{project.organization.city}}</span>
                 </div>
                 <div class="msg-list fl">
                     <span class="fl">成立日期</span>

donate-service/src/main/webapp/resources/css/base.css

@@ -203,4 +203,14 @@ textarea {
 	font-size: 16px;
 	color: #ef613b;
 	border: 1px solid #dcdcdc;
+}
+
+/* datepicker 今天按钮隐藏，清除按钮样式修改 */
+div.active-time ul.dropdown-menu span.btn-group.pull-left>button.btn:first-child{
+	display: none;
+}
+
+div.active-time ul.dropdown-menu span.btn-group.pull-left>button.btn:nth-child(2){
+	border-bottom-left-radius: 3px;
+	border-top-left-radius: 3px;
 }