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

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

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');
@@ -2090,9 +2094,9 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'file-
     /**
      * 活动详情框
      */
-    app.controller('ActivityDetailCtrl', ['$scope', 'Activity', 'toaster', '$modalInstance', 'BaseService', 'id', '$modal', 'active',
-        function($scope, Activity, toaster, $modalInstance, BaseService, id, $modal, active) {
-            $scope.active = active;
+    app.controller('ActivityDetailCtrl', ['$scope', 'Activity', 'toaster', '$modalInstance', 'BaseService', 'id', '$modal',
+        function($scope, Activity, toaster, $modalInstance, BaseService, id, $modal) {
+
 
             var loadData = function() {
                 // 获取项目详情
@@ -2424,6 +2428,48 @@ define([ 'angularAMD', 'ui.router', 'ui-bootstrap', 'ngLocal', 'ngTable', 'file-
         };
 
         // 保存 或 提交
+        $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);
+            });
+            $scope.activity.projects = projectList;
+            $scope.activity.awards = $scope.awards;
+            var url;
+            if (type) {
+                url = 'activity/submit';
+            } else {
+                url = 'activity/save';
+            }
+            var data = new FormData();
+            data.append('actImg', $scope.actImg);
+            data.append('banner', $scope.banner);
+            // data.append('award1', $scope.award1);
+            // data.append('award2', $scope.award2);
+            // data.append('award3', $scope.award3);
+            // data.append('award4', $scope.award4);
+            data.append('jsonStr', JSON.stringify($scope.activity));
+            $http({
+                headers: {
+                    'Content-Type': undefined
+                },
+                method : 'POST',
+                processData : false,
+                async: false,
+                url : url,
+                data: data
+            }).success(function (data) {
+                if (type) {
+                    toaster.pop('success', '发布成功');
+                } else {
+                    toaster.pop('success', '保存成功');
+                }
+                Activity.deletePrizeImgByBatch({path: $scope.deletePath}, {}, function(data) {
         $scope.submit = function(type) {
             if ($scope.activity.startTime === $scope.activity.endTime) {
                 toaster.pop('info', '开始时间与结束时间不能相同，请修改之后再保存');

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

@@ -621,11 +621,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>
@@ -645,6 +647,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">
@@ -665,6 +670,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">
@@ -673,6 +681,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>
@@ -687,6 +697,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>
@@ -701,6 +713,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>
@@ -714,10 +728,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>
@@ -738,11 +756,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>
@@ -756,11 +778,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 style="color: #5078cb;" 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/java/com/uas/service/donate/dao/ActivityDao.java

@@ -41,10 +41,10 @@ public interface ActivityDao extends JpaRepository<Activity,Long>,JpaSpecificati
     Page<Activity> findEndActivities(Pageable pageable);
 
     //根据活动名关键字，奖品名关键字查询活动
-    @Query("from Activity a where a.name like %:search% or a.id in (select aw.activityId from Award aw where aw.awardName like %:search%) order by a.startTime desc")
+    @Query("from Activity a where  a.publish=2 and NOW()>a.startTime and (a.name like %:search% or a.id in (select aw.activityId from Award aw where aw.awardName like %:search%)) order by a.startTime desc")
     List<Activity> search(@Param("search")String search);
 
-    @Query("from Activity a where a.name like %:search% or a.id in (select aw.activityId from Award aw where aw.awardName like %:search%) order by a.startTime desc")
+    @Query("from Activity a where  a.publish=2 and NOW()>a.startTime and (a.name like %:search% or a.id in (select aw.activityId from Award aw where aw.awardName like %:search%)) order by a.startTime desc")
     Page<Activity> search(@Param("search")String search,Pageable pageable);
 
     /**

donate-service/src/main/resources/templates/activeCenter.ftl

@@ -321,6 +321,7 @@
             width: 160px;
             height: 160px;
             border: 1px solid #e1e1e1;
+            background: url("static/images/loading2.png") no-repeat;
         }
         .section2 .list-item .project-detail{
             margin: 10px 30px 0 0;
@@ -419,7 +420,7 @@
 <div ng-include src="'static/view/common/nav.html'"></div>
 <div id="nav">
     <div class="container clearfix">
-        <div class="fl"><a href=""><img src="static/images/uas.png" alt=""/></a><span style="font-size: 18px;font-weight: bold;">一元捐</span></div>
+        <div class="fl"><a href=""><img src="static/images/uas.png" href="http://www.ubtob.com/index"/></a><span style="font-size: 18px;font-weight: bold;">一元捐</span></div>
         <div class="fr">
             <a href="https://account.ubtob.com/sso/login">登录</a>
             <a href="javascript:void(0)">注册</a>

donate-service/src/main/resources/templates/index.ftl

@@ -14,7 +14,7 @@
     <link rel="stylesheet" href="static/css/bootstrap.min.css">
     <link rel="stylesheet" href="static/css/base.css">
     <link rel="stylesheet" type="text/css" href="static/css/kkpager_orange.css" />
-
+    <link rel="stylesheet" type="text/css" href="static/lib/font-awesome/css/font-awesome.min.css"/>
     <link href="https://cdn.bootcss.com/toastr.js/latest/css/toastr.min.css" rel="stylesheet">
     <link href="static/css/swiper-3.4.2.min.css" rel="stylesheet">
 
@@ -82,6 +82,15 @@
         #nav .fr a:last-child {
             margin-right: 0;
         }
+        #logout{
+             display: none;
+         }
+        #uuName{
+            display: none;
+        }
+        #icon{
+            margin-left: 10px;
+        }
         .main{
             width: 100%;
             margin: 24px 0 150px 0;
@@ -307,6 +316,9 @@
             right: 10px;
             cursor: pointer;
         }
+        #projectList{
+            border:none
+        }
         .section2 .list-item {
             margin-top: 25px;
             padding-bottom: 25px;
@@ -323,7 +335,7 @@
             width: 360px;
             height: 200px;
             border: 1px solid #e1e1e1;
-            background: url("static/images/link.png") no-repeat;
+            background: url("static/images/loading1.png") no-repeat;
         }
         .section2 .list-item .project-detail{
             margin: 10px 30px 0 0;
@@ -695,10 +707,12 @@
 <body ng-app="index">
 <div id="nav">
     <div class="container clearfix">
-        <div class="fl"><a href=""><img src="static/images/uas.png" alt=""/></a><span style="font-size: 18px;font-weight: bold;">一元捐</span></div>
+        <div class="fl"><a href=""><img src="static/images/uas.png" href="http://www.ubtob.com/index"/></a><span style="font-size: 18px;font-weight: bold;">一元捐</span></div>
         <div class="fr">
-            <a href="https://account.ubtob.com/sso/login">登录</a>
-            <a href="javascript:void(0)">注册</a>
+            <a href="javascript:void(0);" id="login">登录</a>
+            <a href="javascript:void(0);" id="uuName"><i class="fa fa-user fa-lg" id="icon"></i></a>
+            <a href="javascript:void(0)" id="register">注册</a>
+            <a href="javascript:void(0)" id="logout">退出</a>
             <a href="http://www.ubtob.com/" target="_blank">进入优软云</a>
         </div>
     </div>
@@ -787,7 +801,7 @@
                     <img src="static/images/index/search.png" alt="" id="searchButton"/>
                 </div>
             </div>
-            <div>
+            <div id="projectList">
                 <#if page?exists>
                     <#list page.content as project>
                     <div class="list-item clearfix">
@@ -854,6 +868,7 @@
                     </#list>
                 </#if>
                 <#--搜索无结果页面-->
+                <#if page?exists>
                     <#if page.totalElements==0>
                         <div class="section noSearch">
                             <div class="img">
@@ -865,6 +880,7 @@
                             </div>
                         </div>
                     </#if>
+                </#if>
                 <#-- 分页按钮-->
                 <#if (page.totalElements>0)>
                     <div id="kkpager"></div>
@@ -885,6 +901,77 @@
 </div>
 </body>
 <script>
+    var returnUrl=window.location.href;
+    $.ajax({
+        url:"http://shicr.ubtob.com:8084/sso/account",
+        type:"GET",
+        success:function(data){
+            console.log(data);
+            if(data.content!=null){
+                $("#uuName").css("display","inline-block");
+                $("#icon").before(data.content.name);
+                $("#logout").css("display","inline-block");
+                $("#login").css("display","none");
+                $("#register").css("display","none");
+            }
+        },
+        error:function(){
+            alert('error');
+        }
+    })
+    //登录
+    $("#login").click(function(){
+        $.ajax({
+            url:"http://shicr.ubtob.com:8084/sso/login",
+            data:{returnUrl:returnUrl},
+            type:"GET",
+            success:function(data){
+                window.location.href=data.content;
+                $("#uuName").css("display","inline-block");
+                $("#icon").before(data.content.name);
+                $("#login").css("display","none");
+                $("#register").css("display","none");
+                $("#logout").css("display","inline-block");
+                $("#uuName").css("display","inline-block");
+            },
+            error:function(data){
+                alert('登录失败');
+            }
+        })
+    })
+    //注册按钮点击
+    $("#register").click(function(){
+        $.ajax({
+            url:"http://shicr.ubtob.com:8084/sso/register",
+            type:"GET",
+            data:{returnUrl:returnUrl},
+            success:function(data){
+                window.location.href=data.content;
+            },
+            error:function(data){
+                alert('登录失败');
+            }
+        })
+    })
+    //退出
+    $("#logout").click(function(){
+       $.ajax({
+           url:"http://shicr.ubtob.com:8084/sso/logout",
+           type:"GET",
+           data:{returnUrl:returnUrl},
+           success:function(data){
+               window.location.href=data.content;
+               $("#login").css("display","inline-block");
+               $("#register").css("display","inline-block");
+               $("#logout").css("display","none");
+               $("#uuName").css("display","none");
+           },
+           error:function(){
+               alert('退出失败');
+           }
+       })
+    })
+
     /*设置只能输入数字和一位小数点和一位小数点后面的两位数字*/
     function clearNoNum(obj){
         obj.value = obj.value.replace(/[^\d.]/g,"");  //清除“数字”和“.”以外的字符
@@ -1011,9 +1098,13 @@
         //返回参数值
         return result ? decodeURIComponent(result[2]) : null;
     }
+    //获取地址栏领域值
     var area=getUrlParam('area');
+    //获取地址栏状态值
     var status=getUrlParam('status');
+    //获取地址栏页码值
     var pno=getUrlParam('page');
+    //获取地址栏搜索框值
     var search=getUrlParam('search');
 
 
@@ -1059,23 +1150,26 @@
         }
 
     });
+    var address='http://lj.ubtob.com/index';
     /*页面跳转*/
     function searchpage(pno) {
         if(search!=null){
-            window.location.href="http://lj.ubtob.com/index?search="+search+"&&page="+(pno-1);
+            window.location.href=address+"?search="+search+"&&page="+(pno-1);
         }else{
             //得到被选中的领域下拉框的文本值
             var area=$("#chooseArea").find("option:selected").text();
             //得到被选中的状态下拉框文本值
             var status=$("#chooseStatus").find("option:selected").text();
-            window.location.href="http://lj.ubtob.com/index?area="+area+"&&status="+status+"&&page="+(pno-1);
+            window.location.href=address+"?area="+area+"&&status="+status+"&&page="+(pno-1);
         }
     }
-
+    //给领域下拉框赋值
     $('#chooseArea').val(area);
 
+    //给状态下拉框
     $('#chooseStatus').val(status);
 
+    //给搜索框赋值
     $('#search').val(search);
 
     //项目领域下拉框查询项目
@@ -1084,7 +1178,7 @@
         var area=$("#chooseArea").find("option:selected").text();
         //得到被选中的状态下拉框文本值
         var status=$("#chooseStatus").find("option:selected").text();
-        window.location.href="http://lj.ubtob.com/index?area="+area+"&&status="+status;
+        window.location.href=address+"?area="+area+"&&status="+status;
     })
 
     //项目状态下拉框查询项目
@@ -1093,7 +1187,7 @@
         var area=$("#chooseArea").find("option:selected").text();
         //得到被选中的状态下拉框文本值
         var status=$("#chooseStatus").find("option:selected").text();
-        window.location.href="http://lj.ubtob.com/index?area="+area+"&&status="+status;
+        window.location.href=address+"?area="+area+"&&status="+status;
     })
 
     //搜索框enter键搜索框查询项目
@@ -1101,9 +1195,9 @@
         if(event.keyCode==13){
             var search=$("#search").val();
             if(search!=""){
-                window.location.href="http://lj.ubtob.com/index?search="+search;
+                window.location.href=address+"?search="+search;
             }else{
-                window.location.href="http://lj.ubtob.com/index";
+                window.location.href=address;
             }
         }
     })
@@ -1112,9 +1206,9 @@
     $("#searchButton").click(function(){
         var search=$("#search").val();
         if(search!=""){
-            window.location.href="http://lj.ubtob.com/index?search="+search;
+            window.location.href=address+"?search="+search;
         }else{
-            window.location.href="http://lj.ubtob.com/index";
+            window.location.href=uaddressrl;
         }
 
     })

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 {